AyeCode / invoicing

includes/wpinv-general-functions.php

Braces +18 added lines, -12 removed lines

@@ -67,8 +67,9 @@ 
     
     if ( !empty( $args ) ) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if ( is_string( $args ) ) {
+                    $args = str_replace( '?', '', $args );
+        }
 
         $args = wp_parse_args( $args );
 
@@ -87,8 +88,9 @@ 
     
     if ( !empty( $args ) ) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if ( is_string( $args ) ) {
+                    $args = str_replace( '?', '', $args );
+        }
 
         $args = wp_parse_args( $args );
 
@@ -108,8 +110,9 @@ 
 
 	if ( !empty( $args ) ) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if ( is_string( $args ) ) {
+					$args = str_replace( '?', '', $args );
+		}
 
 		$args = wp_parse_args( $args );
 
@@ -132,8 +135,9 @@ 
 
 	if ( ! empty( $args ) ) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if ( is_string( $args ) ) {
+					$args = str_replace( '?', '', $args );
+		}
 
 		$args = wp_parse_args( $args );
 
@@ -148,8 +152,9 @@ 
 	$success_page = wpinv_get_option( 'success_page', 0 );
 	$success_page = get_permalink( $success_page );
 
-	if ( $query_string )
-		$success_page .= $query_string;
+	if ( $query_string ) {
+			$success_page .= $query_string;
+	}
 
 	return apply_filters( 'wpinv_success_page_url', $success_page );
 }
@@ -158,8 +163,9 @@ 
 	$uri = wpinv_get_option( 'failure_page', '' );
 	$uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
 
-	if ( $extras )
-		$uri .= $extras;
+	if ( $extras ) {
+			$uri .= $extras;
+	}
 
 	return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
 }

Indentation +84 added lines, -84 removed lines

@@ -30,36 +30,36 @@ 
 }
 
 function wpinv_can_checkout() {
-	$can_checkout = true; // Always true for now
+    $can_checkout = true; // Always true for now
 
-	return (bool) apply_filters( 'wpinv_can_checkout', $can_checkout );
+    return (bool) apply_filters( 'wpinv_can_checkout', $can_checkout );
 }
 
 function wpinv_get_success_page_uri() {
-	$page_id = wpinv_get_option( 'success_page', 0 );
-	$page_id = absint( $page_id );
+    $page_id = wpinv_get_option( 'success_page', 0 );
+    $page_id = absint( $page_id );
 
-	return apply_filters( 'wpinv_get_success_page_uri', get_permalink( $page_id ) );
+    return apply_filters( 'wpinv_get_success_page_uri', get_permalink( $page_id ) );
 }
 
 function wpinv_get_history_page_uri() {
-	$page_id = wpinv_get_option( 'invoice_history_page', 0 );
-	$page_id = absint( $page_id );
+    $page_id = wpinv_get_option( 'invoice_history_page', 0 );
+    $page_id = absint( $page_id );
 
-	return apply_filters( 'wpinv_get_history_page_uri', get_permalink( $page_id ) );
+    return apply_filters( 'wpinv_get_history_page_uri', get_permalink( $page_id ) );
 }
 
 function wpinv_is_success_page() {
-	$is_success_page = wpinv_get_option( 'success_page', false );
-	$is_success_page = isset( $is_success_page ) ? is_page( $is_success_page ) : false;
+    $is_success_page = wpinv_get_option( 'success_page', false );
+    $is_success_page = isset( $is_success_page ) ? is_page( $is_success_page ) : false;
 
-	return apply_filters( 'wpinv_is_success_page', $is_success_page );
+    return apply_filters( 'wpinv_is_success_page', $is_success_page );
 }
 
 function wpinv_is_invoice_history_page() {
-	$ret = wpinv_get_option( 'invoice_history_page', false );
-	$ret = $ret ? is_page( $ret ) : false;
-	return apply_filters( 'wpinv_is_invoice_history_page', $ret );
+    $ret = wpinv_get_option( 'invoice_history_page', false );
+    $ret = $ret ? is_page( $ret ) : false;
+    return apply_filters( 'wpinv_is_invoice_history_page', $ret );
 }
 
 function wpinv_is_subscriptions_history_page() {
@@ -69,7 +69,7 @@ 
 }
 
 function wpinv_send_to_success_page( $args = null ) {
-	$redirect = wpinv_get_success_page_uri();
+    $redirect = wpinv_get_success_page_uri();
     
     if ( !empty( $args ) ) {
         // Check for backward compatibility
@@ -89,7 +89,7 @@ 
 }
 
 function wpinv_send_to_failed_page( $args = null ) {
-	$redirect = wpinv_get_failed_transaction_uri();
+    $redirect = wpinv_get_failed_transaction_uri();
     
     if ( !empty( $args ) ) {
         // Check for backward compatibility
@@ -109,73 +109,73 @@ 
 }
 
 function wpinv_get_checkout_uri( $args = array() ) {
-	$uri = wpinv_get_option( 'checkout_page', false );
-	$uri = isset( $uri ) ? get_permalink( $uri ) : NULL;
+    $uri = wpinv_get_option( 'checkout_page', false );
+    $uri = isset( $uri ) ? get_permalink( $uri ) : NULL;
 
-	if ( !empty( $args ) ) {
-		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+    if ( !empty( $args ) ) {
+        // Check for backward compatibility
+        if ( is_string( $args ) )
+            $args = str_replace( '?', '', $args );
 
-		$args = wp_parse_args( $args );
+        $args = wp_parse_args( $args );
 
-		$uri = add_query_arg( $args, $uri );
-	}
+        $uri = add_query_arg( $args, $uri );
+    }
 
-	$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
+    $scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
 
-	$ajax_url = admin_url( 'admin-ajax.php', $scheme );
+    $ajax_url = admin_url( 'admin-ajax.php', $scheme );
 
-	if ( ( ! preg_match( '/^https/', $uri ) && preg_match( '/^https/', $ajax_url ) ) || wpinv_is_ssl_enforced() ) {
-		$uri = preg_replace( '/^http:/', 'https:', $uri );
-	}
+    if ( ( ! preg_match( '/^https/', $uri ) && preg_match( '/^https/', $ajax_url ) ) || wpinv_is_ssl_enforced() ) {
+        $uri = preg_replace( '/^http:/', 'https:', $uri );
+    }
 
-	return apply_filters( 'wpinv_get_checkout_uri', $uri );
+    return apply_filters( 'wpinv_get_checkout_uri', $uri );
 }
 
 function wpinv_send_back_to_checkout( $args = array() ) {
-	$redirect = wpinv_get_checkout_uri();
+    $redirect = wpinv_get_checkout_uri();
 
-	if ( ! empty( $args ) ) {
-		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+    if ( ! empty( $args ) ) {
+        // Check for backward compatibility
+        if ( is_string( $args ) )
+            $args = str_replace( '?', '', $args );
 
-		$args = wp_parse_args( $args );
+        $args = wp_parse_args( $args );
 
-		$redirect = add_query_arg( $args, $redirect );
-	}
+        $redirect = add_query_arg( $args, $redirect );
+    }
 
     do_action( 'wpinv_pre_send_back_to_checkout', $args );
-	wp_redirect( apply_filters( 'wpinv_send_back_to_checkout', $redirect, $args ) );
-	exit;
+    wp_redirect( apply_filters( 'wpinv_send_back_to_checkout', $redirect, $args ) );
+    exit;
 }
 
 function wpinv_get_success_page_url( $query_string = null ) {
-	$success_page = wpinv_get_option( 'success_page', 0 );
-	$success_page = get_permalink( $success_page );
+    $success_page = wpinv_get_option( 'success_page', 0 );
+    $success_page = get_permalink( $success_page );
 
-	if ( $query_string )
-		$success_page .= $query_string;
+    if ( $query_string )
+        $success_page .= $query_string;
 
-	return apply_filters( 'wpinv_success_page_url', $success_page );
+    return apply_filters( 'wpinv_success_page_url', $success_page );
 }
 
 function wpinv_get_failed_transaction_uri( $extras = false ) {
-	$uri = wpinv_get_option( 'failure_page', '' );
-	$uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
+    $uri = wpinv_get_option( 'failure_page', '' );
+    $uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
 
-	if ( $extras )
-		$uri .= $extras;
+    if ( $extras )
+        $uri .= $extras;
 
-	return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
+    return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
 }
 
 function wpinv_is_failed_transaction_page() {
-	$ret = wpinv_get_option( 'failure_page', false );
-	$ret = isset( $ret ) ? is_page( $ret ) : false;
+    $ret = wpinv_get_option( 'failure_page', false );
+    $ret = isset( $ret ) ? is_page( $ret ) : false;
 
-	return apply_filters( 'wpinv_is_failure_page', $ret );
+    return apply_filters( 'wpinv_is_failure_page', $ret );
 }
 
 function wpinv_transaction_query( $type = 'start' ) {
@@ -325,36 +325,36 @@ 
     $require_billing_details = apply_filters( 'wpinv_checkout_required_billing_details', wpinv_use_taxes() );
     
     if ( $require_billing_details ) {
-		if ( (bool)wpinv_get_option( 'fname_mandatory' ) ) {
-			$required_fields['first_name'] = array(
-				'error_id' => 'invalid_first_name',
-				'error_message' => __( 'Please enter your first name', 'invoicing' )
-			);
-		}
-		if ( (bool)wpinv_get_option( 'address_mandatory' ) ) {
-			$required_fields['address'] = array(
-				'error_id' => 'invalid_address',
-				'error_message' => __( 'Please enter your address', 'invoicing' )
-			);
-		}
-		if ( (bool)wpinv_get_option( 'city_mandatory' ) ) {
-			$required_fields['city'] = array(
-				'error_id' => 'invalid_city',
-				'error_message' => __( 'Please enter your billing city', 'invoicing' )
-			);
-		}
-		if ( (bool)wpinv_get_option( 'state_mandatory' ) ) {
-			$required_fields['state'] = array(
-				'error_id' => 'invalid_state',
-				'error_message' => __( 'Please enter billing state / province', 'invoicing' )
-			);
-		}
-		if ( (bool)wpinv_get_option( 'country_mandatory' ) ) {
-			$required_fields['country'] = array(
-				'error_id' => 'invalid_country',
-				'error_message' => __( 'Please select your billing country', 'invoicing' )
-			);
-		}
+        if ( (bool)wpinv_get_option( 'fname_mandatory' ) ) {
+            $required_fields['first_name'] = array(
+                'error_id' => 'invalid_first_name',
+                'error_message' => __( 'Please enter your first name', 'invoicing' )
+            );
+        }
+        if ( (bool)wpinv_get_option( 'address_mandatory' ) ) {
+            $required_fields['address'] = array(
+                'error_id' => 'invalid_address',
+                'error_message' => __( 'Please enter your address', 'invoicing' )
+            );
+        }
+        if ( (bool)wpinv_get_option( 'city_mandatory' ) ) {
+            $required_fields['city'] = array(
+                'error_id' => 'invalid_city',
+                'error_message' => __( 'Please enter your billing city', 'invoicing' )
+            );
+        }
+        if ( (bool)wpinv_get_option( 'state_mandatory' ) ) {
+            $required_fields['state'] = array(
+                'error_id' => 'invalid_state',
+                'error_message' => __( 'Please enter billing state / province', 'invoicing' )
+            );
+        }
+        if ( (bool)wpinv_get_option( 'country_mandatory' ) ) {
+            $required_fields['country'] = array(
+                'error_id' => 'invalid_country',
+                'error_message' => __( 'Please select your billing country', 'invoicing' )
+            );
+        }
     }
 
     return apply_filters( 'wpinv_checkout_required_fields', $required_fields );

Spacing +186 added lines, -186 removed lines

@@ -7,202 +7,202 @@ 
  */
  
 // 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_is_checkout() {
     global $wp_query;
 
-    $is_object_set    = isset( $wp_query->queried_object );
-    $is_object_id_set = isset( $wp_query->queried_object_id );
-    $is_checkout      = is_page( wpinv_get_option( 'checkout_page' ) );
+    $is_object_set    = isset($wp_query->queried_object);
+    $is_object_id_set = isset($wp_query->queried_object_id);
+    $is_checkout      = is_page(wpinv_get_option('checkout_page'));
 
-    if ( !$is_object_set ) {
-        unset( $wp_query->queried_object );
+    if (!$is_object_set) {
+        unset($wp_query->queried_object);
     }
 
-    if ( !$is_object_id_set ) {
-        unset( $wp_query->queried_object_id );
+    if (!$is_object_id_set) {
+        unset($wp_query->queried_object_id);
     }
 
-    return apply_filters( 'wpinv_is_checkout', $is_checkout );
+    return apply_filters('wpinv_is_checkout', $is_checkout);
 }
 
 function wpinv_can_checkout() {
 	$can_checkout = true; // Always true for now
 
-	return (bool) apply_filters( 'wpinv_can_checkout', $can_checkout );
+	return (bool) apply_filters('wpinv_can_checkout', $can_checkout);
 }
 
 function wpinv_get_success_page_uri() {
-	$page_id = wpinv_get_option( 'success_page', 0 );
-	$page_id = absint( $page_id );
+	$page_id = wpinv_get_option('success_page', 0);
+	$page_id = absint($page_id);
 
-	return apply_filters( 'wpinv_get_success_page_uri', get_permalink( $page_id ) );
+	return apply_filters('wpinv_get_success_page_uri', get_permalink($page_id));
 }
 
 function wpinv_get_history_page_uri() {
-	$page_id = wpinv_get_option( 'invoice_history_page', 0 );
-	$page_id = absint( $page_id );
+	$page_id = wpinv_get_option('invoice_history_page', 0);
+	$page_id = absint($page_id);
 
-	return apply_filters( 'wpinv_get_history_page_uri', get_permalink( $page_id ) );
+	return apply_filters('wpinv_get_history_page_uri', get_permalink($page_id));
 }
 
 function wpinv_is_success_page() {
-	$is_success_page = wpinv_get_option( 'success_page', false );
-	$is_success_page = isset( $is_success_page ) ? is_page( $is_success_page ) : false;
+	$is_success_page = wpinv_get_option('success_page', false);
+	$is_success_page = isset($is_success_page) ? is_page($is_success_page) : false;
 
-	return apply_filters( 'wpinv_is_success_page', $is_success_page );
+	return apply_filters('wpinv_is_success_page', $is_success_page);
 }
 
 function wpinv_is_invoice_history_page() {
-	$ret = wpinv_get_option( 'invoice_history_page', false );
-	$ret = $ret ? is_page( $ret ) : false;
-	return apply_filters( 'wpinv_is_invoice_history_page', $ret );
+	$ret = wpinv_get_option('invoice_history_page', false);
+	$ret = $ret ? is_page($ret) : false;
+	return apply_filters('wpinv_is_invoice_history_page', $ret);
 }
 
 function wpinv_is_subscriptions_history_page() {
-    $ret = wpinv_get_option( 'invoice_subscription_page', false );
-    $ret = $ret ? is_page( $ret ) : false;
-    return apply_filters( 'wpinv_is_subscriptions_history_page', $ret );
+    $ret = wpinv_get_option('invoice_subscription_page', false);
+    $ret = $ret ? is_page($ret) : false;
+    return apply_filters('wpinv_is_subscriptions_history_page', $ret);
 }
 
-function wpinv_send_to_success_page( $args = null ) {
+function wpinv_send_to_success_page($args = null) {
 	$redirect = wpinv_get_success_page_uri();
     
-    if ( !empty( $args ) ) {
+    if (!empty($args)) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if (is_string($args))
+            $args = str_replace('?', '', $args);
 
-        $args = wp_parse_args( $args );
+        $args = wp_parse_args($args);
 
-        $redirect = add_query_arg( $args, $redirect );
+        $redirect = add_query_arg($args, $redirect);
     }
 
-    $gateway = isset( $_REQUEST['wpi-gateway'] ) ? $_REQUEST['wpi-gateway'] : '';
+    $gateway = isset($_REQUEST['wpi-gateway']) ? $_REQUEST['wpi-gateway'] : '';
     
-    $redirect = apply_filters( 'wpinv_success_page_redirect', $redirect, $gateway, $args );
-    wp_redirect( $redirect );
+    $redirect = apply_filters('wpinv_success_page_redirect', $redirect, $gateway, $args);
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_send_to_failed_page( $args = null ) {
+function wpinv_send_to_failed_page($args = null) {
 	$redirect = wpinv_get_failed_transaction_uri();
     
-    if ( !empty( $args ) ) {
+    if (!empty($args)) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if (is_string($args))
+            $args = str_replace('?', '', $args);
 
-        $args = wp_parse_args( $args );
+        $args = wp_parse_args($args);
 
-        $redirect = add_query_arg( $args, $redirect );
+        $redirect = add_query_arg($args, $redirect);
     }
 
-    $gateway = isset( $_REQUEST['wpi-gateway'] ) ? $_REQUEST['wpi-gateway'] : '';
+    $gateway = isset($_REQUEST['wpi-gateway']) ? $_REQUEST['wpi-gateway'] : '';
     
-    $redirect = apply_filters( 'wpinv_failed_page_redirect', $redirect, $gateway, $args );
-    wp_redirect( $redirect );
+    $redirect = apply_filters('wpinv_failed_page_redirect', $redirect, $gateway, $args);
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_get_checkout_uri( $args = array() ) {
-	$uri = wpinv_get_option( 'checkout_page', false );
-	$uri = isset( $uri ) ? get_permalink( $uri ) : NULL;
+function wpinv_get_checkout_uri($args = array()) {
+	$uri = wpinv_get_option('checkout_page', false);
+	$uri = isset($uri) ? get_permalink($uri) : NULL;
 
-	if ( !empty( $args ) ) {
+	if (!empty($args)) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if (is_string($args))
+			$args = str_replace('?', '', $args);
 
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
-		$uri = add_query_arg( $args, $uri );
+		$uri = add_query_arg($args, $uri);
 	}
 
-	$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
+	$scheme = defined('FORCE_SSL_ADMIN') && FORCE_SSL_ADMIN ? 'https' : 'admin';
 
-	$ajax_url = admin_url( 'admin-ajax.php', $scheme );
+	$ajax_url = admin_url('admin-ajax.php', $scheme);
 
-	if ( ( ! preg_match( '/^https/', $uri ) && preg_match( '/^https/', $ajax_url ) ) || wpinv_is_ssl_enforced() ) {
-		$uri = preg_replace( '/^http:/', 'https:', $uri );
+	if ((!preg_match('/^https/', $uri) && preg_match('/^https/', $ajax_url)) || wpinv_is_ssl_enforced()) {
+		$uri = preg_replace('/^http:/', 'https:', $uri);
 	}
 
-	return apply_filters( 'wpinv_get_checkout_uri', $uri );
+	return apply_filters('wpinv_get_checkout_uri', $uri);
 }
 
-function wpinv_send_back_to_checkout( $args = array() ) {
+function wpinv_send_back_to_checkout($args = array()) {
 	$redirect = wpinv_get_checkout_uri();
 
-	if ( ! empty( $args ) ) {
+	if (!empty($args)) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if (is_string($args))
+			$args = str_replace('?', '', $args);
 
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
-		$redirect = add_query_arg( $args, $redirect );
+		$redirect = add_query_arg($args, $redirect);
 	}
 
-    do_action( 'wpinv_pre_send_back_to_checkout', $args );
-	wp_redirect( apply_filters( 'wpinv_send_back_to_checkout', $redirect, $args ) );
+    do_action('wpinv_pre_send_back_to_checkout', $args);
+	wp_redirect(apply_filters('wpinv_send_back_to_checkout', $redirect, $args));
 	exit;
 }
 
-function wpinv_get_success_page_url( $query_string = null ) {
-	$success_page = wpinv_get_option( 'success_page', 0 );
-	$success_page = get_permalink( $success_page );
+function wpinv_get_success_page_url($query_string = null) {
+	$success_page = wpinv_get_option('success_page', 0);
+	$success_page = get_permalink($success_page);
 
-	if ( $query_string )
+	if ($query_string)
 		$success_page .= $query_string;
 
-	return apply_filters( 'wpinv_success_page_url', $success_page );
+	return apply_filters('wpinv_success_page_url', $success_page);
 }
 
-function wpinv_get_failed_transaction_uri( $extras = false ) {
-	$uri = wpinv_get_option( 'failure_page', '' );
-	$uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
+function wpinv_get_failed_transaction_uri($extras = false) {
+	$uri = wpinv_get_option('failure_page', '');
+	$uri = !empty($uri) ? trailingslashit(get_permalink($uri)) : home_url();
 
-	if ( $extras )
+	if ($extras)
 		$uri .= $extras;
 
-	return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
+	return apply_filters('wpinv_get_failed_transaction_uri', $uri);
 }
 
 function wpinv_is_failed_transaction_page() {
-	$ret = wpinv_get_option( 'failure_page', false );
-	$ret = isset( $ret ) ? is_page( $ret ) : false;
+	$ret = wpinv_get_option('failure_page', false);
+	$ret = isset($ret) ? is_page($ret) : false;
 
-	return apply_filters( 'wpinv_is_failure_page', $ret );
+	return apply_filters('wpinv_is_failure_page', $ret);
 }
 
-function wpinv_transaction_query( $type = 'start' ) {
+function wpinv_transaction_query($type = 'start') {
     global $wpdb;
 
     $wpdb->hide_errors();
 
-    if ( ! defined( 'WPINV_USE_TRANSACTIONS' ) ) {
-        define( 'WPINV_USE_TRANSACTIONS', true );
+    if (!defined('WPINV_USE_TRANSACTIONS')) {
+        define('WPINV_USE_TRANSACTIONS', true);
     }
 
-    if ( WPINV_USE_TRANSACTIONS ) {
-        switch ( $type ) {
+    if (WPINV_USE_TRANSACTIONS) {
+        switch ($type) {
             case 'commit' :
-                $wpdb->query( 'COMMIT' );
+                $wpdb->query('COMMIT');
                 break;
             case 'rollback' :
-                $wpdb->query( 'ROLLBACK' );
+                $wpdb->query('ROLLBACK');
                 break;
             default :
-                $wpdb->query( 'START TRANSACTION' );
+                $wpdb->query('START TRANSACTION');
             break;
         }
     }
 }
 
-function wpinv_create_invoice( $args = array(), $data = array(), $wp_error = false ) {
+function wpinv_create_invoice($args = array(), $data = array(), $wp_error = false) {
     $default_args = array(
         'status'        => '',
         'user_id'       => null,
@@ -213,66 +213,66 @@ 
         'post_type'     => 'wpi_invoice'
     );
 
-    $args           = wp_parse_args( $args, $default_args );
+    $args           = wp_parse_args($args, $default_args);
     $invoice_data   = array();
 
-    if ( $args['invoice_id'] > 0 ) {
-        $updating           = true;
+    if ($args['invoice_id'] > 0) {
+        $updating = true;
         $invoice_data['post_type']  = $args['post_type'];
         $invoice_data['ID']         = $args['invoice_id'];
     } else {
         $updating                       = false;
         $invoice_data['post_type']      = $args['post_type'];
-        $invoice_data['post_status']    = apply_filters( 'wpinv_default_invoice_status', 'wpi-pending' );
+        $invoice_data['post_status']    = apply_filters('wpinv_default_invoice_status', 'wpi-pending');
         $invoice_data['ping_status']    = 'closed';
-        $invoice_data['post_author']    = !empty( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
-        $invoice_data['post_title']     = wpinv_format_invoice_number( '0' );
-        $invoice_data['post_parent']    = absint( $args['parent'] );
-        if ( !empty( $args['created_date'] ) ) {
+        $invoice_data['post_author']    = !empty($args['user_id']) ? $args['user_id'] : get_current_user_id();
+        $invoice_data['post_title']     = wpinv_format_invoice_number('0');
+        $invoice_data['post_parent']    = absint($args['parent']);
+        if (!empty($args['created_date'])) {
             $invoice_data['post_date']      = $args['created_date'];
-            $invoice_data['post_date_gmt']  = get_gmt_from_date( $args['created_date'] );
+            $invoice_data['post_date_gmt']  = get_gmt_from_date($args['created_date']);
         }
     }
 
-    if ( $args['status'] ) {
-        if ( ! in_array( $args['status'], array_keys( wpinv_get_invoice_statuses() ) ) && 'wpi_invoice' === $invoice_data['post_type'] ) {
-            return new WP_Error( 'wpinv_invalid_invoice_status', wp_sprintf( __( 'Invalid invoice status: %s', 'invoicing' ), $args['status'] ) );
+    if ($args['status']) {
+        if (!in_array($args['status'], array_keys(wpinv_get_invoice_statuses())) && 'wpi_invoice' === $invoice_data['post_type']) {
+            return new WP_Error('wpinv_invalid_invoice_status', wp_sprintf(__('Invalid invoice status: %s', 'invoicing'), $args['status']));
         }
-        $invoice_data['post_status']    = $args['status'];
+        $invoice_data['post_status'] = $args['status'];
     }
 
-    if ( ! is_null( $args['user_note'] ) ) {
-        $invoice_data['post_excerpt']   = $args['user_note'];
+    if (!is_null($args['user_note'])) {
+        $invoice_data['post_excerpt'] = $args['user_note'];
     }
 
-    if ( $updating ) {
-        $invoice_id = wp_update_post( $invoice_data, true );
+    if ($updating) {
+        $invoice_id = wp_update_post($invoice_data, true);
     } else {
-        $invoice_id = wp_insert_post( apply_filters( 'wpinv_new_invoice_data', $invoice_data ), true );
+        $invoice_id = wp_insert_post(apply_filters('wpinv_new_invoice_data', $invoice_data), true);
     }
 
-    if ( is_wp_error( $invoice_id ) ) {
+    if (is_wp_error($invoice_id)) {
         return $wp_error ? $invoice_id : 0;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-
-    if ( !$updating ) {
-        update_post_meta( $invoice_id, '_wpinv_key', apply_filters( 'wpinv_generate_invoice_key', uniqid( 'wpinv_' ) ) );
-        update_post_meta( $invoice_id, '_wpinv_currency', wpinv_get_currency() );
-        update_post_meta( $invoice_id, '_wpinv_include_tax', get_option( 'wpinv_prices_include_tax' ) );
-        update_post_meta( $invoice_id, '_wpinv_user_ip', wpinv_get_ip() );
-        update_post_meta( $invoice_id, '_wpinv_user_agent', wpinv_get_user_agent() );
-        update_post_meta( $invoice_id, '_wpinv_created_via', sanitize_text_field( $args['created_via'] ) );
+    $invoice = wpinv_get_invoice($invoice_id);
+
+    if (!$updating) {
+        update_post_meta($invoice_id, '_wpinv_key', apply_filters('wpinv_generate_invoice_key', uniqid('wpinv_')));
+        update_post_meta($invoice_id, '_wpinv_currency', wpinv_get_currency());
+        update_post_meta($invoice_id, '_wpinv_include_tax', get_option('wpinv_prices_include_tax'));
+        update_post_meta($invoice_id, '_wpinv_user_ip', wpinv_get_ip());
+        update_post_meta($invoice_id, '_wpinv_user_agent', wpinv_get_user_agent());
+        update_post_meta($invoice_id, '_wpinv_created_via', sanitize_text_field($args['created_via']));
         
         // Add invoice note
-        if ( ! $invoice->is_quote() ) {
-            $invoice->add_note( wp_sprintf( __( 'Invoice is created with status %s.', 'invoicing' ), wpinv_status_nicename( $invoice->status ) ) );
+        if (!$invoice->is_quote()) {
+            $invoice->add_note(wp_sprintf(__('Invoice is created with status %s.', 'invoicing'), wpinv_status_nicename($invoice->status)));
         }
         
     }
 
-    update_post_meta( $invoice_id, '_wpinv_version', WPINV_VERSION );
+    update_post_meta($invoice_id, '_wpinv_version', WPINV_VERSION);
 
     return $invoice;
 }
@@ -280,193 +280,193 @@ 
 function wpinv_get_prefix() {
     $invoice_prefix = 'INV-';
     
-    return apply_filters( 'wpinv_get_prefix', $invoice_prefix );
+    return apply_filters('wpinv_get_prefix', $invoice_prefix);
 }
 
 function wpinv_get_business_logo() {
-    $business_logo = wpinv_get_option( 'logo' );
-    return apply_filters( 'wpinv_get_business_logo', $business_logo );
+    $business_logo = wpinv_get_option('logo');
+    return apply_filters('wpinv_get_business_logo', $business_logo);
 }
 
 function wpinv_get_business_name() {
     $business_name = wpinv_get_option('store_name');
-    return apply_filters( 'wpinv_get_business_name', $business_name );
+    return apply_filters('wpinv_get_business_name', $business_name);
 }
 
 function wpinv_get_blogname() {
-    return wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    return wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 }
 
 function wpinv_get_admin_email() {
-    $admin_email = wpinv_get_option( 'admin_email', get_option( 'admin_email' ) );
-    return apply_filters( 'wpinv_admin_email', $admin_email );
+    $admin_email = wpinv_get_option('admin_email', get_option('admin_email'));
+    return apply_filters('wpinv_admin_email', $admin_email);
 }
 
 function wpinv_get_business_website() {
-    $business_website = home_url( '/' );
-    return apply_filters( 'wpinv_get_business_website', $business_website );
+    $business_website = home_url('/');
+    return apply_filters('wpinv_get_business_website', $business_website);
 }
 
-function wpinv_get_terms_text( $invoice_id = 0 ) {
+function wpinv_get_terms_text($invoice_id = 0) {
     $terms_text = '';
-    return apply_filters( 'wpinv_get_terms_text', $terms_text, $invoice_id );
+    return apply_filters('wpinv_get_terms_text', $terms_text, $invoice_id);
 }
 
 function wpinv_get_business_footer() {
-    $site_link = '<a target="_blank" href="' . esc_url( wpinv_get_business_website() ) . '">' . esc_html( wpinv_get_business_name() ) . '</a>';
-    $business_footer = wp_sprintf( __( 'Thanks for using %s', 'invoicing' ), $site_link );
-    return apply_filters( 'wpinv_get_business_footer', $business_footer );
+    $site_link = '<a target="_blank" href="' . esc_url(wpinv_get_business_website()) . '">' . esc_html(wpinv_get_business_name()) . '</a>';
+    $business_footer = wp_sprintf(__('Thanks for using %s', 'invoicing'), $site_link);
+    return apply_filters('wpinv_get_business_footer', $business_footer);
 }
 
 function wpinv_checkout_required_fields() {
     $required_fields = array();
     
     // Let payment gateways and other extensions determine if address fields should be required
-    $require_billing_details = apply_filters( 'wpinv_checkout_required_billing_details', wpinv_use_taxes() );
+    $require_billing_details = apply_filters('wpinv_checkout_required_billing_details', wpinv_use_taxes());
     
-    if ( $require_billing_details ) {
-		if ( (bool)wpinv_get_option( 'fname_mandatory' ) ) {
+    if ($require_billing_details) {
+		if ((bool) wpinv_get_option('fname_mandatory')) {
 			$required_fields['first_name'] = array(
 				'error_id' => 'invalid_first_name',
-				'error_message' => __( 'Please enter your first name', 'invoicing' )
+				'error_message' => __('Please enter your first name', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'address_mandatory' ) ) {
+		if ((bool) wpinv_get_option('address_mandatory')) {
 			$required_fields['address'] = array(
 				'error_id' => 'invalid_address',
-				'error_message' => __( 'Please enter your address', 'invoicing' )
+				'error_message' => __('Please enter your address', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'city_mandatory' ) ) {
+		if ((bool) wpinv_get_option('city_mandatory')) {
 			$required_fields['city'] = array(
 				'error_id' => 'invalid_city',
-				'error_message' => __( 'Please enter your billing city', 'invoicing' )
+				'error_message' => __('Please enter your billing city', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'state_mandatory' ) ) {
+		if ((bool) wpinv_get_option('state_mandatory')) {
 			$required_fields['state'] = array(
 				'error_id' => 'invalid_state',
-				'error_message' => __( 'Please enter billing state / province', 'invoicing' )
+				'error_message' => __('Please enter billing state / province', 'invoicing')
 			);
 		}
-		if ( (bool)wpinv_get_option( 'country_mandatory' ) ) {
+		if ((bool) wpinv_get_option('country_mandatory')) {
 			$required_fields['country'] = array(
 				'error_id' => 'invalid_country',
-				'error_message' => __( 'Please select your billing country', 'invoicing' )
+				'error_message' => __('Please select your billing country', 'invoicing')
 			);
 		}
     }
 
-    return apply_filters( 'wpinv_checkout_required_fields', $required_fields );
+    return apply_filters('wpinv_checkout_required_fields', $required_fields);
 }
 
 function wpinv_is_ssl_enforced() {
-    $ssl_enforced = wpinv_get_option( 'enforce_ssl', false );
-    return (bool) apply_filters( 'wpinv_is_ssl_enforced', $ssl_enforced );
+    $ssl_enforced = wpinv_get_option('enforce_ssl', false);
+    return (bool) apply_filters('wpinv_is_ssl_enforced', $ssl_enforced);
 }
 
-function wpinv_user_can_view_invoice( $post ) {
+function wpinv_user_can_view_invoice($post) {
     $allow = false;
 
-    $post = get_post( $post );
+    $post = get_post($post);
 
-    if ( empty( $post->ID ) ) {
+    if (empty($post->ID)) {
         return $allow;
     }
 
-    $invoice = wpinv_get_invoice( $post->ID );
-    if ( empty( $invoice->ID ) ) {
+    $invoice = wpinv_get_invoice($post->ID);
+    if (empty($invoice->ID)) {
         return $allow;
     }
 
     // Don't allow trash, draft status
-    if ( $invoice->has_status( array_keys( wpinv_get_invoice_statuses() ) ) ) {
-        if ( wpinv_current_user_can_manage_invoicing() || current_user_can( 'view_invoices', $invoice->ID ) ) { // Admin user
+    if ($invoice->has_status(array_keys(wpinv_get_invoice_statuses()))) {
+        if (wpinv_current_user_can_manage_invoicing() || current_user_can('view_invoices', $invoice->ID)) { // Admin user
             $allow = true;
         } else {
-            if ( is_user_logged_in() ) {
-                if ( (int)$invoice->get_user_id() === (int)get_current_user_id() ) {
+            if (is_user_logged_in()) {
+                if ((int) $invoice->get_user_id() === (int) get_current_user_id()) {
                     $allow = true;
-                } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                } else if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
                     $allow = true;
                 }
             } else {
-                if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
                     $allow = true;
                 }
             }
         }
     }
     
-    return apply_filters( 'wpinv_can_print_invoice', $allow, $post, $invoice );
+    return apply_filters('wpinv_can_print_invoice', $allow, $post, $invoice);
 }
 
 function wpinv_schedule_events() {
 
     // Get the timestamp for the next event.
-    $timestamp = wp_next_scheduled( 'wpinv_register_schedule_event_twicedaily' );
+    $timestamp = wp_next_scheduled('wpinv_register_schedule_event_twicedaily');
 
-    if ( $timestamp ) {
-        wp_unschedule_event( $timestamp, 'wpinv_register_schedule_event_twicedaily' );
+    if ($timestamp) {
+        wp_unschedule_event($timestamp, 'wpinv_register_schedule_event_twicedaily');
     }
 
-    if ( ! wp_next_scheduled( 'wpinv_register_schedule_event_daily' ) ) {
-        wp_schedule_event( current_time( 'timestamp' ), 'daily', 'wpinv_register_schedule_event_daily' );
+    if (!wp_next_scheduled('wpinv_register_schedule_event_daily')) {
+        wp_schedule_event(current_time('timestamp'), 'daily', 'wpinv_register_schedule_event_daily');
     }
 }
-add_action( 'wp', 'wpinv_schedule_events' );
+add_action('wp', 'wpinv_schedule_events');
 
 function wpinv_schedule_event_twicedaily() {
     wpinv_email_payment_reminders();
     wpinv_email_renewal_reminders();
 }
-add_action( 'wpinv_register_schedule_event_daily', 'wpinv_schedule_event_twicedaily' );
+add_action('wpinv_register_schedule_event_daily', 'wpinv_schedule_event_twicedaily');
 
 function wpinv_require_login_to_checkout() {
-    $return = wpinv_get_option( 'login_to_checkout', false );
-    return (bool) apply_filters( 'wpinv_require_login_to_checkout', $return );
+    $return = wpinv_get_option('login_to_checkout', false);
+    return (bool) apply_filters('wpinv_require_login_to_checkout', $return);
 }
 
-function wpinv_sequential_number_active( $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_check_sequential_number_active', null, $type );
-    if ( null !== $check ) {
+function wpinv_sequential_number_active($type = '') {
+    $check = apply_filters('wpinv_pre_check_sequential_number_active', null, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    return wpinv_get_option( 'sequential_invoice_number' );
+    return wpinv_get_option('sequential_invoice_number');
 }
 
-function wpinv_switch_to_locale( $locale = NULL ) {
+function wpinv_switch_to_locale($locale = NULL) {
     global $invoicing, $wpi_switch_locale;
 
-    if ( ! empty( $invoicing ) && function_exists( 'switch_to_locale' ) ) {
-        $locale = empty( $locale ) ? get_locale() : $locale;
+    if (!empty($invoicing) && function_exists('switch_to_locale')) {
+        $locale = empty($locale) ? get_locale() : $locale;
 
-        switch_to_locale( $locale );
+        switch_to_locale($locale);
 
         $wpi_switch_locale = $locale;
 
-        add_filter( 'plugin_locale', 'get_locale' );
+        add_filter('plugin_locale', 'get_locale');
 
         $invoicing->load_textdomain();
 
-        do_action( 'wpinv_switch_to_locale', $locale );
+        do_action('wpinv_switch_to_locale', $locale);
     }
 }
 
 function wpinv_restore_locale() {
     global $invoicing, $wpi_switch_locale;
     
-    if ( ! empty( $invoicing ) && function_exists( 'restore_previous_locale' ) && $wpi_switch_locale ) {
+    if (!empty($invoicing) && function_exists('restore_previous_locale') && $wpi_switch_locale) {
         restore_previous_locale();
 
         $wpi_switch_locale = NULL;
 
-        remove_filter( 'plugin_locale', 'get_locale' );
+        remove_filter('plugin_locale', 'get_locale');
 
         $invoicing->load_textdomain();
 
-        do_action( 'wpinv_restore_locale' );
+        do_action('wpinv_restore_locale');
     }
 }
 
@@ -474,22 +474,22 @@ 
  * Returns the default form's id.
  */
 function wpinv_get_default_payment_form() {
-    $form = get_option( 'wpinv_default_payment_form' );
+    $form = get_option('wpinv_default_payment_form');
 
-    if ( empty( $form ) || 'publish' != get_post_status( $form ) ) {
+    if (empty($form) || 'publish' != get_post_status($form)) {
         $form = wp_insert_post(
             array(
                 'post_type'   => 'wpi_payment_form',
-                'post_title'  => __( 'Checkout (default)', 'invoicing' ),
+                'post_title'  => __('Checkout (default)', 'invoicing'),
                 'post_status' => 'publish',
                 'meta_input'  => array(
-                    'wpinv_form_elements' => wpinv_get_data( 'default-payment-form' ),
+                    'wpinv_form_elements' => wpinv_get_data('default-payment-form'),
                     'wpinv_form_items'    => array(),
                 )
             )
         );
 
-        update_option( 'wpinv_default_payment_form', $form );
+        update_option('wpinv_default_payment_form', $form);
     }
 
     return $form;

includes/admin/admin-pages.php

Braces +3 added lines, -2 removed lines

@@ -196,8 +196,9 @@
             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>';
             }

Spacing +152 added lines, -152 removed lines

@@ -1,66 +1,66 @@ 
 <?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_filter( 'manage_wpi_payment_form_posts_columns', 'wpinv_payment_form_columns' );
-function wpinv_payment_form_columns( $existing_columns ) {
+add_filter('manage_wpi_payment_form_posts_columns', 'wpinv_payment_form_columns');
+function wpinv_payment_form_columns($existing_columns) {
     $date = $existing_columns['date'];
-    unset( $existing_columns['date'] );
-    $existing_columns['shortcode'] = __( 'Shortcode', 'invoicing' );
+    unset($existing_columns['date']);
+    $existing_columns['shortcode'] = __('Shortcode', 'invoicing');
     $existing_columns['date'] = $date;
     return $existing_columns;
 }
 
-add_action( 'manage_wpi_payment_form_posts_custom_column', 'wpinv_payment_form_custom_column' );
-function wpinv_payment_form_custom_column( $column ) {
+add_action('manage_wpi_payment_form_posts_custom_column', 'wpinv_payment_form_custom_column');
+function wpinv_payment_form_custom_column($column) {
     global $post;
 
-    if( 'shortcode' == $column ) {
-        WPInv_Meta_Box_Payment_Form::output_shortcode( $post );
+    if ('shortcode' == $column) {
+        WPInv_Meta_Box_Payment_Form::output_shortcode($post);
     }
 
 }
 
-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;';
             }
@@ -68,8 +68,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 = '-';
             }
@@ -77,50 +77,50 @@ 
             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>';
     }
 
     $delete_url = esc_url(
@@ -134,110 +134,110 @@ 
             'wpinv_discount_nonce'
         )
     );
-    $row_actions['delete'] = '<a href="' . $delete_url . '">' . __( 'Delete', 'invoicing' ) . '</a>';
+    $row_actions['delete'] = '<a href="' . $delete_url . '">' . __('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(
@@ -245,7 +245,7 @@ 
                         'orderby'  => 'meta_value_num'
                     )
                 );
-            } else if ( 'customer' == $vars['orderby'] ) {
+            } else if ('customer' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -253,7 +253,7 @@ 
                         'orderby'  => 'meta_value'
                     )
                 );
-            } else if ( 'number' == $vars['orderby'] ) {
+            } else if ('number' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -261,7 +261,7 @@ 
                         'orderby'  => 'meta_value'
                     )
                 );
-            } else if ( 'payment_date' == $vars['orderby'] ) {
+            } else if ('payment_date' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -271,9 +271,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(
@@ -284,7 +284,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(
@@ -295,7 +295,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(
@@ -306,7 +306,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(
@@ -317,7 +317,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(
@@ -327,104 +327,104 @@ 
             );
         }
 
-        $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_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']);
         }
     }
 
@@ -441,19 +441,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;
@@ -462,40 +462,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',
@@ -507,11 +507,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/wpinv-gateway-functions.php

Indentation +28 added lines, -28 removed lines

@@ -286,26 +286,26 @@ 
 }
 
 function wpinv_get_chosen_gateway( $invoice_id = 0 ) {
-	$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+    $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
 
     $chosen = false;
     if ( $invoice_id > 0 && $invoice = wpinv_get_invoice( $invoice_id ) ) {
         $chosen = $invoice->get_gateway();
     }
 
-	$chosen   = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen;
+    $chosen   = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen;
 
-	if ( false !== $chosen ) {
-		$chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen );
-	}
+    if ( false !== $chosen ) {
+        $chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen );
+    }
 
-	if ( ! empty ( $chosen ) ) {
-		$enabled_gateway = urldecode( $chosen );
-	} else if (  !empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) {
-		$enabled_gateway = 'manual';
-	} else {
-		$enabled_gateway = wpinv_get_default_gateway();
-	}
+    if ( ! empty ( $chosen ) ) {
+        $enabled_gateway = urldecode( $chosen );
+    } else if (  !empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) {
+        $enabled_gateway = 'manual';
+    } else {
+        $enabled_gateway = wpinv_get_default_gateway();
+    }
     
     if ( !wpinv_is_gateway_active( $enabled_gateway ) && !empty( $gateways ) ) {
         if(wpinv_is_gateway_active( wpinv_get_default_gateway()) ){
@@ -316,7 +316,7 @@ 
 
     }
 
-	return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway );
+    return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway );
 }
 
 function wpinv_record_gateway_error( $title = '', $message = '', $parent = 0 ) {
@@ -324,21 +324,21 @@ 
 }
 
 function wpinv_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) {
-	$ret  = 0;
-	$args = array(
-		'meta_key'    => '_wpinv_gateway',
-		'meta_value'  => $gateway_id,
-		'nopaging'    => true,
-		'post_type'   => 'wpi_invoice',
-		'post_status' => $status,
-		'fields'      => 'ids'
-	);
-
-	$payments = new WP_Query( $args );
-
-	if( $payments )
-		$ret = $payments->post_count;
-	return $ret;
+    $ret  = 0;
+    $args = array(
+        'meta_key'    => '_wpinv_gateway',
+        'meta_value'  => $gateway_id,
+        'nopaging'    => true,
+        'post_type'   => 'wpi_invoice',
+        'post_status' => $status,
+        'fields'      => 'ids'
+    );
+
+    $payments = new WP_Query( $args );
+
+    if( $payments )
+        $ret = $payments->post_count;
+    return $ret;
 }
 
 function wpinv_settings_update_gateways( $input ) {

Braces +4 added lines, -3 removed lines

@@ -310,7 +310,7 @@ 
     if ( !wpinv_is_gateway_active( $enabled_gateway ) && !empty( $gateways ) ) {
         if(wpinv_is_gateway_active( wpinv_get_default_gateway()) ){
             $enabled_gateway = wpinv_get_default_gateway();
-        }else{
+        } else{
             $enabled_gateway = $gateways[0];
         }
 
@@ -336,8 +336,9 @@ 
 
 	$payments = new WP_Query( $args );
 
-	if( $payments )
-		$ret = $payments->post_count;
+	if( $payments ) {
+			$ret = $payments->post_count;
+	}
 	return $ret;
 }
 

Spacing +258 added lines, -258 removed lines

@@ -7,206 +7,206 @@ 
  */
  
 // 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_get_payment_gateways() {
     // Default, built-in gateways
     $gateways = array(
         'paypal' => array(
-            'admin_label'    => __( 'PayPal Standard', 'invoicing' ),
-            'checkout_label' => __( 'PayPal Standard', 'invoicing' ),
+            'admin_label'    => __('PayPal Standard', 'invoicing'),
+            'checkout_label' => __('PayPal Standard', 'invoicing'),
             'ordering'       => 1,
         ),
         'authorizenet' => array(
-            'admin_label'    => __( 'Authorize.Net (AIM)', 'invoicing' ),
-            'checkout_label' => __( 'Authorize.Net - Credit Card / Debit Card', 'invoicing' ),
+            'admin_label'    => __('Authorize.Net (AIM)', 'invoicing'),
+            'checkout_label' => __('Authorize.Net - Credit Card / Debit Card', 'invoicing'),
             'ordering'       => 4,
         ),
         'worldpay' => array(
-            'admin_label'    => __( 'Worldpay', 'invoicing' ),
-            'checkout_label' => __( 'Worldpay - Credit Card / Debit Card', 'invoicing' ),
+            'admin_label'    => __('Worldpay', 'invoicing'),
+            'checkout_label' => __('Worldpay - Credit Card / Debit Card', 'invoicing'),
             'ordering'       => 5,
         ),
         'bank_transfer' => array(
-            'admin_label'    => __( 'Pre Bank Transfer', 'invoicing' ),
-            'checkout_label' => __( 'Pre Bank Transfer', 'invoicing' ),
+            'admin_label'    => __('Pre Bank Transfer', 'invoicing'),
+            'checkout_label' => __('Pre Bank Transfer', 'invoicing'),
             'ordering'       => 11,
         ),
         'manual' => array(
-            'admin_label'    => __( 'Manual Payment', 'invoicing' ),
-            'checkout_label' => __( 'Manual Payment', 'invoicing' ),
+            'admin_label'    => __('Manual Payment', 'invoicing'),
+            'checkout_label' => __('Manual Payment', 'invoicing'),
             'ordering'       => 12,
         ),
     );
 
-    return apply_filters( 'wpinv_payment_gateways', $gateways );
+    return apply_filters('wpinv_payment_gateways', $gateways);
 }
 
-function wpinv_payment_gateway_titles( $all_gateways ) {
+function wpinv_payment_gateway_titles($all_gateways) {
     global $wpinv_options;
 
     $gateways = array();
-    foreach ( $all_gateways as $key => $gateway ) {
-        if ( !empty( $wpinv_options[$key . '_title'] ) ) {
-            $all_gateways[$key]['checkout_label'] = __( $wpinv_options[$key . '_title'], 'invoicing' );
+    foreach ($all_gateways as $key => $gateway) {
+        if (!empty($wpinv_options[$key . '_title'])) {
+            $all_gateways[$key]['checkout_label'] = __($wpinv_options[$key . '_title'], 'invoicing');
         }
 
-        $gateways[$key] = isset( $wpinv_options[$key . '_ordering'] ) ? $wpinv_options[$key . '_ordering'] : ( isset( $gateway['ordering'] ) ? $gateway['ordering'] : '' );
+        $gateways[$key] = isset($wpinv_options[$key . '_ordering']) ? $wpinv_options[$key . '_ordering'] : (isset($gateway['ordering']) ? $gateway['ordering'] : '');
     }
 
-    asort( $gateways );
+    asort($gateways);
 
-    foreach ( $gateways as $gateway => $key ) {
+    foreach ($gateways as $gateway => $key) {
         $gateways[$gateway] = $all_gateways[$gateway];
     }
 
     return $gateways;
 }
-add_filter( 'wpinv_payment_gateways', 'wpinv_payment_gateway_titles', 1000, 1 );
+add_filter('wpinv_payment_gateways', 'wpinv_payment_gateway_titles', 1000, 1);
 
-function wpinv_get_enabled_payment_gateways( $sort = false ) {
+function wpinv_get_enabled_payment_gateways($sort = false) {
     $gateways = wpinv_get_payment_gateways();
-    $enabled  = wpinv_get_option( 'gateways', false );
+    $enabled  = wpinv_get_option('gateways', false);
 
     $gateway_list = array();
 
-    foreach ( $gateways as $key => $gateway ) {
-        if ( isset( $enabled[ $key ] ) && $enabled[ $key ] == 1 ) {
-            $gateway_list[ $key ] = $gateway;
+    foreach ($gateways as $key => $gateway) {
+        if (isset($enabled[$key]) && $enabled[$key] == 1) {
+            $gateway_list[$key] = $gateway;
         }
     }
 
-    if ( true === $sort ) {
-        uasort( $gateway_list, 'wpinv_sort_gateway_order' );
+    if (true === $sort) {
+        uasort($gateway_list, 'wpinv_sort_gateway_order');
         
         // Reorder our gateways so the default is first
         $default_gateway_id = wpinv_get_default_gateway();
 
-        if ( wpinv_is_gateway_active( $default_gateway_id ) ) {
-            $default_gateway    = array( $default_gateway_id => $gateway_list[ $default_gateway_id ] );
-            unset( $gateway_list[ $default_gateway_id ] );
+        if (wpinv_is_gateway_active($default_gateway_id)) {
+            $default_gateway = array($default_gateway_id => $gateway_list[$default_gateway_id]);
+            unset($gateway_list[$default_gateway_id]);
 
-            $gateway_list = array_merge( $default_gateway, $gateway_list );
+            $gateway_list = array_merge($default_gateway, $gateway_list);
         }
     }
 
-    return apply_filters( 'wpinv_enabled_payment_gateways', $gateway_list );
+    return apply_filters('wpinv_enabled_payment_gateways', $gateway_list);
 }
 
-function wpinv_sort_gateway_order( $a, $b ) {
+function wpinv_sort_gateway_order($a, $b) {
     return $a['ordering'] - $b['ordering'];
 }
 
-function wpinv_is_gateway_active( $gateway ) {
+function wpinv_is_gateway_active($gateway) {
     $gateways = wpinv_get_enabled_payment_gateways();
 
-    $ret = is_array($gateways) && $gateway ?  array_key_exists( $gateway, $gateways ) : false;
+    $ret = is_array($gateways) && $gateway ?  array_key_exists($gateway, $gateways) : false;
 
-    return apply_filters( 'wpinv_is_gateway_active', $ret, $gateway, $gateways );
+    return apply_filters('wpinv_is_gateway_active', $ret, $gateway, $gateways);
 }
 
 function wpinv_get_default_gateway() {
-    $default = wpinv_get_option( 'default_gateway', 'paypal' );
+    $default = wpinv_get_option('default_gateway', 'paypal');
 
-    if ( !wpinv_is_gateway_active( $default ) ) {
+    if (!wpinv_is_gateway_active($default)) {
         $gateways = wpinv_get_enabled_payment_gateways();
-        $gateways = array_keys( $gateways );
-        $default  = reset( $gateways );
+        $gateways = array_keys($gateways);
+        $default  = reset($gateways);
     }
 
-    return apply_filters( 'wpinv_default_gateway', $default );
+    return apply_filters('wpinv_default_gateway', $default);
 }
 
-function wpinv_get_gateway_admin_label( $gateway ) {
+function wpinv_get_gateway_admin_label($gateway) {
     $gateways = wpinv_get_payment_gateways();
-    $label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['admin_label'] : $gateway;
-    $payment  = isset( $_GET['id'] ) ? absint( $_GET['id'] ) : false;
+    $label    = isset($gateways[$gateway]) ? $gateways[$gateway]['admin_label'] : $gateway;
+    $payment  = isset($_GET['id']) ? absint($_GET['id']) : false;
 
-    if( $gateway == 'manual' && $payment ) {
-        if( !( (float)wpinv_payment_total( $payment ) > 0 ) ) {
-            $label = __( 'Free Purchase', 'invoicing' );
+    if ($gateway == 'manual' && $payment) {
+        if (!((float) wpinv_payment_total($payment) > 0)) {
+            $label = __('Free Purchase', 'invoicing');
         }
     }
 
-    return apply_filters( 'wpinv_gateway_admin_label', $label, $gateway );
+    return apply_filters('wpinv_gateway_admin_label', $label, $gateway);
 }
 
-function wpinv_get_gateway_description( $gateway ) {
+function wpinv_get_gateway_description($gateway) {
     global $wpinv_options;
 
-    $description = isset( $wpinv_options[$gateway . '_desc'] ) ? $wpinv_options[$gateway . '_desc'] : '';
+    $description = isset($wpinv_options[$gateway . '_desc']) ? $wpinv_options[$gateway . '_desc'] : '';
 
-    return apply_filters( 'wpinv_gateway_description', $description, $gateway );
+    return apply_filters('wpinv_gateway_description', $description, $gateway);
 }
 
-function wpinv_get_gateway_button_label( $gateway ) {
-    return apply_filters( 'wpinv_gateway_' . $gateway . '_button_label', '' );
+function wpinv_get_gateway_button_label($gateway) {
+    return apply_filters('wpinv_gateway_' . $gateway . '_button_label', '');
 }
 
-function wpinv_get_gateway_checkout_label( $gateway ) {
+function wpinv_get_gateway_checkout_label($gateway) {
     $gateways = wpinv_get_payment_gateways();
-    $label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['checkout_label'] : $gateway;
+    $label    = isset($gateways[$gateway]) ? $gateways[$gateway]['checkout_label'] : $gateway;
 
-    if( $gateway == 'manual' ) {
-        $label = __( 'Manual Payment', 'invoicing' );
+    if ($gateway == 'manual') {
+        $label = __('Manual Payment', 'invoicing');
     }
 
-    return apply_filters( 'wpinv_gateway_checkout_label', $label, $gateway );
+    return apply_filters('wpinv_gateway_checkout_label', $label, $gateway);
 }
 
-function wpinv_settings_sections_gateways( $settings ) {
+function wpinv_settings_sections_gateways($settings) {
     $gateways = wpinv_get_payment_gateways();
     
     if (!empty($gateways)) {
-        foreach  ($gateways as $key => $gateway) {
+        foreach ($gateways as $key => $gateway) {
             $settings[$key] = $gateway['admin_label'];
         }
     }
     
     return $settings;    
 }
-add_filter( 'wpinv_settings_sections_gateways', 'wpinv_settings_sections_gateways', 10, 1 );
+add_filter('wpinv_settings_sections_gateways', 'wpinv_settings_sections_gateways', 10, 1);
 
-function wpinv_settings_gateways( $settings ) {
+function wpinv_settings_gateways($settings) {
     $gateways = wpinv_get_payment_gateways();
     
     if (!empty($gateways)) {
-        foreach  ($gateways as $key => $gateway) {
+        foreach ($gateways as $key => $gateway) {
             $setting = array();
             $setting[$key . '_header'] = array(
                     'id'   => 'gateway_header',
-                    'name' => '<h3>' . wp_sprintf( __( '%s Settings', 'invoicing' ), $gateway['admin_label'] ) . '</h3>',
+                    'name' => '<h3>' . wp_sprintf(__('%s Settings', 'invoicing'), $gateway['admin_label']) . '</h3>',
                     'custom' => $key,
                     'type' => 'gateway_header',
                 );
             $setting[$key . '_active'] = array(
                     'id'   => $key . '_active',
-                    'name' => __( 'Active', 'invoicing' ),
-                    'desc' => wp_sprintf( __( 'Enable %s', 'invoicing' ), $gateway['admin_label'] ),
+                    'name' => __('Active', 'invoicing'),
+                    'desc' => wp_sprintf(__('Enable %s', 'invoicing'), $gateway['admin_label']),
                     'type' => 'checkbox',
                 );
                 
             $setting[$key . '_title'] = array(
                     'id'   => $key . '_title',
-                    'name' => __( 'Title', 'invoicing' ),
-                    'desc' => __( 'This controls the title which the user sees during checkout.', 'invoicing' ),
+                    'name' => __('Title', 'invoicing'),
+                    'desc' => __('This controls the title which the user sees during checkout.', 'invoicing'),
                     'type' => 'text',
                     'std' => isset($gateway['checkout_label']) ? $gateway['checkout_label'] : ''
                 );
             
             $setting[$key . '_desc'] = array(
                     'id'   => $key . '_desc',
-                    'name' => __( 'Description', 'invoicing' ),
-                    'desc' => __( 'This controls the description which the user sees during checkout.', 'invoicing' ),
+                    'name' => __('Description', 'invoicing'),
+                    'desc' => __('This controls the description which the user sees during checkout.', 'invoicing'),
                     'type' => 'text',
                     'size' => 'large'
                 );
                 
             $setting[$key . '_ordering'] = array(
                     'id'   => $key . '_ordering',
-                    'name' => __( 'Display Order', 'invoicing' ),
+                    'name' => __('Display Order', 'invoicing'),
                     'type' => 'number',
                     'size' => 'small',
                     'std'  => isset($gateway['ordering']) ? $gateway['ordering'] : '10',
@@ -215,8 +215,8 @@ 
                     'step' => '1'
                 );
                 
-            $setting = apply_filters( 'wpinv_gateway_settings', $setting, $key );
-            $setting = apply_filters( 'wpinv_gateway_settings_' . $key, $setting );
+            $setting = apply_filters('wpinv_gateway_settings', $setting, $key);
+            $setting = apply_filters('wpinv_gateway_settings_' . $key, $setting);
             
             $settings[$key] = $setting;
         }
@@ -224,106 +224,106 @@ 
     
     return $settings;    
 }
-add_filter( 'wpinv_settings_gateways', 'wpinv_settings_gateways', 10, 1 );
+add_filter('wpinv_settings_gateways', 'wpinv_settings_gateways', 10, 1);
 
-function wpinv_gateway_header_callback( $args ) {
-    echo '<input type="hidden" id="wpinv_settings[save_gateway]" name="wpinv_settings[save_gateway]" value="' . esc_attr( $args['custom'] ) . '" />';
+function wpinv_gateway_header_callback($args) {
+    echo '<input type="hidden" id="wpinv_settings[save_gateway]" name="wpinv_settings[save_gateway]" value="' . esc_attr($args['custom']) . '" />';
 }
 
-function wpinv_get_gateway_supports( $gateway ) {
+function wpinv_get_gateway_supports($gateway) {
     $gateways = wpinv_get_enabled_payment_gateways();
-    $supports = isset( $gateways[ $gateway ]['supports'] ) ? $gateways[ $gateway ]['supports'] : array();
-    return apply_filters( 'wpinv_gateway_supports', $supports, $gateway );
+    $supports = isset($gateways[$gateway]['supports']) ? $gateways[$gateway]['supports'] : array();
+    return apply_filters('wpinv_gateway_supports', $supports, $gateway);
 }
 
-function wpinv_gateway_supports_buy_now( $gateway ) {
-    $supports = wpinv_get_gateway_supports( $gateway );
-    $ret = in_array( 'buy_now', $supports );
-    return apply_filters( 'wpinv_gateway_supports_buy_now', $ret, $gateway );
+function wpinv_gateway_supports_buy_now($gateway) {
+    $supports = wpinv_get_gateway_supports($gateway);
+    $ret = in_array('buy_now', $supports);
+    return apply_filters('wpinv_gateway_supports_buy_now', $ret, $gateway);
 }
 
 function wpinv_shop_supports_buy_now() {
     $gateways = wpinv_get_enabled_payment_gateways();
     $ret      = false;
 
-    if ( !wpinv_use_taxes()  && $gateways ) {
-        foreach ( $gateways as $gateway_id => $gateway ) {
-            if ( wpinv_gateway_supports_buy_now( $gateway_id ) ) {
+    if (!wpinv_use_taxes() && $gateways) {
+        foreach ($gateways as $gateway_id => $gateway) {
+            if (wpinv_gateway_supports_buy_now($gateway_id)) {
                 $ret = true;
                 break;
             }
         }
     }
 
-    return apply_filters( 'wpinv_shop_supports_buy_now', $ret );
+    return apply_filters('wpinv_shop_supports_buy_now', $ret);
 }
 
-function wpinv_send_to_gateway( $gateway, $payment_data ) {
-    $payment_data['gateway_nonce'] = wp_create_nonce( 'wpi-gateway' );
+function wpinv_send_to_gateway($gateway, $payment_data) {
+    $payment_data['gateway_nonce'] = wp_create_nonce('wpi-gateway');
 
     // $gateway must match the ID used when registering the gateway
-    do_action( 'wpinv_gateway_' . $gateway, $payment_data );
+    do_action('wpinv_gateway_' . $gateway, $payment_data);
 }
 
 function wpinv_show_gateways() {
     $gateways = wpinv_get_enabled_payment_gateways();
     $show_gateways = false;
 
-    $chosen_gateway = isset( $_GET['payment-mode'] ) ? preg_replace('/[^a-zA-Z0-9-_]+/', '', $_GET['payment-mode'] ) : false;
+    $chosen_gateway = isset($_GET['payment-mode']) ? preg_replace('/[^a-zA-Z0-9-_]+/', '', $_GET['payment-mode']) : false;
 
-    if ( count( $gateways ) > 1 && empty( $chosen_gateway ) ) {
+    if (count($gateways) > 1 && empty($chosen_gateway)) {
         $show_gateways = true;
-        if ( wpinv_get_cart_total() <= 0 ) {
+        if (wpinv_get_cart_total() <= 0) {
             $show_gateways = false;
         }
     }
     
-    if ( !$show_gateways && wpinv_cart_has_recurring_item() ) {
+    if (!$show_gateways && wpinv_cart_has_recurring_item()) {
         $show_gateways = true;
     }
 
-    return apply_filters( 'wpinv_show_gateways', $show_gateways );
+    return apply_filters('wpinv_show_gateways', $show_gateways);
 }
 
-function wpinv_get_chosen_gateway( $invoice_id = 0 ) {
-	$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+function wpinv_get_chosen_gateway($invoice_id = 0) {
+	$gateways = array_keys(wpinv_get_enabled_payment_gateways());
 
     $chosen = false;
-    if ( $invoice_id > 0 && $invoice = wpinv_get_invoice( $invoice_id ) ) {
+    if ($invoice_id > 0 && $invoice = wpinv_get_invoice($invoice_id)) {
         $chosen = $invoice->get_gateway();
     }
 
-	$chosen   = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen;
+	$chosen = isset($_REQUEST['payment-mode']) ? sanitize_text_field($_REQUEST['payment-mode']) : $chosen;
 
-	if ( false !== $chosen ) {
-		$chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen );
+	if (false !== $chosen) {
+		$chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen);
 	}
 
-	if ( ! empty ( $chosen ) ) {
-		$enabled_gateway = urldecode( $chosen );
-	} else if (  !empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) {
+	if (!empty ($chosen)) {
+		$enabled_gateway = urldecode($chosen);
+	} else if (!empty($invoice) && (float) $invoice->get_subtotal() <= 0) {
 		$enabled_gateway = 'manual';
 	} else {
 		$enabled_gateway = wpinv_get_default_gateway();
 	}
     
-    if ( !wpinv_is_gateway_active( $enabled_gateway ) && !empty( $gateways ) ) {
-        if(wpinv_is_gateway_active( wpinv_get_default_gateway()) ){
+    if (!wpinv_is_gateway_active($enabled_gateway) && !empty($gateways)) {
+        if (wpinv_is_gateway_active(wpinv_get_default_gateway())) {
             $enabled_gateway = wpinv_get_default_gateway();
-        }else{
+        } else {
             $enabled_gateway = $gateways[0];
         }
 
     }
 
-	return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway );
+	return apply_filters('wpinv_chosen_gateway', $enabled_gateway);
 }
 
-function wpinv_record_gateway_error( $title = '', $message = '', $parent = 0 ) {
-    return wpinv_error_log( $message, $title );
+function wpinv_record_gateway_error($title = '', $message = '', $parent = 0) {
+    return wpinv_error_log($message, $title);
 }
 
-function wpinv_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) {
+function wpinv_count_sales_by_gateway($gateway_id = 'paypal', $status = 'publish') {
 	$ret  = 0;
 	$args = array(
 		'meta_key'    => '_wpinv_gateway',
@@ -334,48 +334,48 @@ 
 		'fields'      => 'ids'
 	);
 
-	$payments = new WP_Query( $args );
+	$payments = new WP_Query($args);
 
-	if( $payments )
+	if ($payments)
 		$ret = $payments->post_count;
 	return $ret;
 }
 
-function wpinv_settings_update_gateways( $input ) {
+function wpinv_settings_update_gateways($input) {
     global $wpinv_options;
     
-    if ( !empty( $input['save_gateway'] ) ) {
-        $gateways = wpinv_get_option( 'gateways', false );
+    if (!empty($input['save_gateway'])) {
+        $gateways = wpinv_get_option('gateways', false);
         $gateways = !empty($gateways) ? $gateways : array();
         $gateway = $input['save_gateway'];
         
-        if ( !empty( $input[$gateway . '_active'] ) ) {
+        if (!empty($input[$gateway . '_active'])) {
             $gateways[$gateway] = 1;
         } else {
-            if ( isset( $gateways[$gateway] ) ) {
-                unset( $gateways[$gateway] );
+            if (isset($gateways[$gateway])) {
+                unset($gateways[$gateway]);
             }
         }
         
         $input['gateways'] = $gateways;
     }
     
-    if ( !empty( $input['default_gateway'] ) ) {
+    if (!empty($input['default_gateway'])) {
         $gateways = wpinv_get_payment_gateways();
         
-        foreach ( $gateways as $key => $gateway ) {
-            $active   = 0;
-            if ( !empty( $input['gateways'] ) && !empty( $input['gateways'][$key] ) ) {
+        foreach ($gateways as $key => $gateway) {
+            $active = 0;
+            if (!empty($input['gateways']) && !empty($input['gateways'][$key])) {
                 $active = 1;
             }
             
             $input[$key . '_active'] = $active;
             
-            if ( empty( $wpinv_options[$key . '_title'] ) ) {
+            if (empty($wpinv_options[$key . '_title'])) {
                 $input[$key . '_title'] = $gateway['checkout_label'];
             }
             
-            if ( !isset( $wpinv_options[$key . '_ordering'] ) && isset( $gateway['ordering'] ) ) {
+            if (!isset($wpinv_options[$key . '_ordering']) && isset($gateway['ordering'])) {
                 $input[$key . '_ordering'] = $gateway['ordering'];
             }
         }
@@ -383,27 +383,27 @@ 
     
     return $input;
 }
-add_filter( 'wpinv_settings_tab_gateways_sanitize', 'wpinv_settings_update_gateways', 10, 1 );
+add_filter('wpinv_settings_tab_gateways_sanitize', 'wpinv_settings_update_gateways', 10, 1);
 
 // PayPal Standard settings
-function wpinv_gateway_settings_paypal( $setting ) {    
-    $setting['paypal_active']['desc'] = $setting['paypal_active']['desc'] . ' ' . __( '( Supported Currencies: AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, NOK, NZD, PHP, PLN, GBP, SGD, SEK, CHF, TWD, THB, USD )', 'invoicing' );
-    $setting['paypal_desc']['std'] = __( 'Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing' );
+function wpinv_gateway_settings_paypal($setting) {    
+    $setting['paypal_active']['desc'] = $setting['paypal_active']['desc'] . ' ' . __('( Supported Currencies: AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, NOK, NZD, PHP, PLN, GBP, SGD, SEK, CHF, TWD, THB, USD )', 'invoicing');
+    $setting['paypal_desc']['std'] = __('Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing');
     
     $setting['paypal_sandbox'] = array(
             'type' => 'checkbox',
             'id'   => 'paypal_sandbox',
-            'name' => __( 'PayPal Sandbox', 'invoicing' ),
-            'desc' => __( 'PayPal sandbox can be used to test payments.', 'invoicing' ),
+            'name' => __('PayPal Sandbox', 'invoicing'),
+            'desc' => __('PayPal sandbox can be used to test payments.', 'invoicing'),
             'std'  => 1
         );
         
     $setting['paypal_email'] = array(
             'type' => 'text',
             'id'   => 'paypal_email',
-            'name' => __( 'PayPal Email', 'invoicing' ),
-            'desc' => __( 'Please enter your PayPal account\'s email address. Ex: myaccount@paypal.com', 'invoicing' ),
-            'std' => __( 'myaccount@paypal.com', 'invoicing' ),
+            'name' => __('PayPal Email', 'invoicing'),
+            'desc' => __('Please enter your PayPal account\'s email address. Ex: myaccount@paypal.com', 'invoicing'),
+            'std' => __('myaccount@paypal.com', 'invoicing'),
         );
     /*
     $setting['paypal_ipn_url'] = array(
@@ -417,139 +417,139 @@ 
         
     return $setting;
 }
-add_filter( 'wpinv_gateway_settings_paypal', 'wpinv_gateway_settings_paypal', 10, 1 );
+add_filter('wpinv_gateway_settings_paypal', 'wpinv_gateway_settings_paypal', 10, 1);
 
 // Pre Bank Transfer settings
-function wpinv_gateway_settings_bank_transfer( $setting ) {
-    $setting['bank_transfer_desc']['std'] = __( 'Make your payment directly into our bank account. Please use your Invoice ID as the payment reference. Your invoice won\'t be processed until the funds have cleared in our account.', 'invoicing' );
+function wpinv_gateway_settings_bank_transfer($setting) {
+    $setting['bank_transfer_desc']['std'] = __('Make your payment directly into our bank account. Please use your Invoice ID as the payment reference. Your invoice won\'t be processed until the funds have cleared in our account.', 'invoicing');
     
     $setting['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id' => 'bank_transfer_ac_name',
-            'name' => __( 'Account Name', 'invoicing' ),
-            'desc' => __( 'Enter the bank account name to which you want to transfer payment.', 'invoicing' ),
-            'std'  =>  __( 'Mr. John Martin', 'invoicing' ),
+            'name' => __('Account Name', 'invoicing'),
+            'desc' => __('Enter the bank account name to which you want to transfer payment.', 'invoicing'),
+            'std'  =>  __('Mr. John Martin', 'invoicing'),
         );
     
     $setting['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id' => 'bank_transfer_ac_no',
-            'name' => __( 'Account Number', 'invoicing' ),
-            'desc' => __( 'Enter your bank account number.', 'invoicing' ),
-            'std'  =>  __( 'TEST1234567890', 'invoicing' ),
+            'name' => __('Account Number', 'invoicing'),
+            'desc' => __('Enter your bank account number.', 'invoicing'),
+            'std'  =>  __('TEST1234567890', 'invoicing'),
         );
     
     $setting['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
-            'name' => __( 'Bank Name', 'invoicing' ),
-            'desc' => __( 'Enter the bank name to which you want to transfer payment.', 'invoicing' ),
-            'std' => __( 'ICICI Bank', 'invoicing' ),
+            'name' => __('Bank Name', 'invoicing'),
+            'desc' => __('Enter the bank name to which you want to transfer payment.', 'invoicing'),
+            'std' => __('ICICI Bank', 'invoicing'),
         );
     
     $setting['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
-            'name' => __( 'IFSC Code', 'invoicing' ),
-            'desc' => __( 'Enter your bank IFSC code.', 'invoicing' ),
-            'std'  =>  __( 'ICIC0001234', 'invoicing' ),
+            'name' => __('IFSC Code', 'invoicing'),
+            'desc' => __('Enter your bank IFSC code.', 'invoicing'),
+            'std'  =>  __('ICIC0001234', 'invoicing'),
         );
         
     $setting['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
-            'name' => __( 'IBAN', 'invoicing' ),
-            'desc' => __( 'Enter your International Bank Account Number(IBAN).', 'invoicing' ),
-            'std'  =>  __( 'GB29NWBK60161331926819', 'invoicing' ),
+            'name' => __('IBAN', 'invoicing'),
+            'desc' => __('Enter your International Bank Account Number(IBAN).', 'invoicing'),
+            'std'  =>  __('GB29NWBK60161331926819', 'invoicing'),
         );
         
     $setting['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
-            'name' => __( 'BIC/Swift Code', 'invoicing' ),
-            'std'  =>  __( 'ICICGB2L129', 'invoicing' ),
+            'name' => __('BIC/Swift Code', 'invoicing'),
+            'std'  =>  __('ICICGB2L129', 'invoicing'),
         );
 
     $setting['bank_transfer_sort_code'] = array(
         'type' => 'text',
         'id'   => 'bank_transfer_sort_code',
-        'name' => __( 'Sort Code', 'invoicing' ),
-        'std'  =>  __( '12-34-56', 'invoicing' ),
+        'name' => __('Sort Code', 'invoicing'),
+        'std'  =>  __('12-34-56', 'invoicing'),
     );
         
     $setting['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
-            'name' => __( 'Instructions', 'invoicing' ),
-            'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
+            'name' => __('Instructions', 'invoicing'),
+            'desc' => __('Instructions that will be added to the thank you page and emails.', 'invoicing'),
             'type' => 'textarea',
-            'std' => __( 'Make your payment directly into our bank account. Please use your Invoice ID as the payment reference. Your invoice won\'t be processed until the funds have cleared in our account.', 'invoicing' ),
+            'std' => __('Make your payment directly into our bank account. Please use your Invoice ID as the payment reference. Your invoice won\'t be processed until the funds have cleared in our account.', 'invoicing'),
             'cols' => 37,
             'rows' => 5
         );
         
     return $setting;
 }
-add_filter( 'wpinv_gateway_settings_bank_transfer', 'wpinv_gateway_settings_bank_transfer', 10, 1 );
+add_filter('wpinv_gateway_settings_bank_transfer', 'wpinv_gateway_settings_bank_transfer', 10, 1);
 
 // Authorize.Net settings
-function wpinv_gateway_settings_authorizenet( $setting ) {
-    $setting['authorizenet_active']['desc'] = $setting['authorizenet_active']['desc'] . ' ' . __( '( Supported Currencies: AUD, CAD, CHF, DKK, EUR, GBP, JPY, NOK, NZD, PLN, SEK, USD, ZAR )', 'invoicing' );
-    $setting['authorizenet_desc']['std'] = __( 'Pay using a Authorize.Net to process Credit card / Debit card transactions.', 'invoicing' );
+function wpinv_gateway_settings_authorizenet($setting) {
+    $setting['authorizenet_active']['desc'] = $setting['authorizenet_active']['desc'] . ' ' . __('( Supported Currencies: AUD, CAD, CHF, DKK, EUR, GBP, JPY, NOK, NZD, PLN, SEK, USD, ZAR )', 'invoicing');
+    $setting['authorizenet_desc']['std'] = __('Pay using a Authorize.Net to process Credit card / Debit card transactions.', 'invoicing');
     
     $setting['authorizenet_sandbox'] = array(
             'type' => 'checkbox',
             'id'   => 'authorizenet_sandbox',
-            'name' => __( 'Authorize.Net Test Mode', 'invoicing' ),
-            'desc' => __( 'Enable Authorize.Net test mode to test payments.', 'invoicing' ),
+            'name' => __('Authorize.Net Test Mode', 'invoicing'),
+            'desc' => __('Enable Authorize.Net test mode to test payments.', 'invoicing'),
             'std'  => 1
         );
         
     $setting['authorizenet_login_id'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_login_id',
-            'name' => __( 'API Login ID', 'invoicing' ),
-            'desc' => __( 'API Login ID can be obtained from Authorize.Net Account > Settings > Security Settings > General Security Settings > API Credentials & Keys. Example : 2j4rBekUnD', 'invoicing' ),
+            'name' => __('API Login ID', 'invoicing'),
+            'desc' => __('API Login ID can be obtained from Authorize.Net Account > Settings > Security Settings > General Security Settings > API Credentials & Keys. Example : 2j4rBekUnD', 'invoicing'),
             'std' => '2j4rBekUnD',
         );
     
     $setting['authorizenet_transaction_key'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_transaction_key',
-            'name' => __( 'Transaction Key', 'invoicing' ),
-            'desc' => __( 'Transaction Key can be obtained from Authorize.Net Account > Settings > Security Settings > General Security Settings > API Credentials & Keys. Example : 4vyBUOJgR74679xa', 'invoicing' ),
+            'name' => __('Transaction Key', 'invoicing'),
+            'desc' => __('Transaction Key can be obtained from Authorize.Net Account > Settings > Security Settings > General Security Settings > API Credentials & Keys. Example : 4vyBUOJgR74679xa', 'invoicing'),
             'std' => '4vyBUOJgR74679xa',
         );
         
     $setting['authorizenet_md5_hash'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_md5_hash',
-            'name' => __( 'MD5-Hash', 'invoicing' ),
-            'desc' => __( 'The MD5 Hash security feature allows to authenticate transaction responses from the Authorize.Net for recurring payments. It can be obtained from Authorize.Net Account > Settings > Security Settings > General Settings > MD5 Hash.', 'invoicing' ),
+            'name' => __('MD5-Hash', 'invoicing'),
+            'desc' => __('The MD5 Hash security feature allows to authenticate transaction responses from the Authorize.Net for recurring payments. It can be obtained from Authorize.Net Account > Settings > Security Settings > General Settings > MD5 Hash.', 'invoicing'),
             'std' => '',
         );
 
     $setting['authorizenet_transaction_type'] = array(
         'id'          => 'authorizenet_transaction_type',
-        'name'        => __( 'Transaction Type', 'invoicing' ),
-        'desc'        => __( 'Choose transaction type.', 'invoicing' ),
+        'name'        => __('Transaction Type', 'invoicing'),
+        'desc'        => __('Choose transaction type.', 'invoicing'),
         'type'        => 'select',
         'class'       => 'wpi_select2',
         'options'     => array(
-            'authorize_capture' => __( 'Authorize And Capture', 'invoicing' ),
-            'authorize_only' => __( 'Authorize Only', 'invoicing' ),
+            'authorize_capture' => __('Authorize And Capture', 'invoicing'),
+            'authorize_only' => __('Authorize Only', 'invoicing'),
         ),
         'std'         => 'authorize_capture'
     );
 
     $setting['authorizenet_transaction_type_recurring'] = array(
         'id'          => 'authorizenet_transaction_type_recurring',
-        'name'        => __( 'Transaction Type for Recurring', 'invoicing' ),
-        'desc'        => __( 'Choose transaction type for recurring payments.', 'invoicing' ),
+        'name'        => __('Transaction Type for Recurring', 'invoicing'),
+        'desc'        => __('Choose transaction type for recurring payments.', 'invoicing'),
         'type'        => 'select',
         'class'       => 'wpi_select2',
         'options'     => array(
-            'authorize_capture' => __( 'Authorize And Capture', 'invoicing' ),
-            'authorize_only' => __( 'Authorize Only', 'invoicing' ),
+            'authorize_capture' => __('Authorize And Capture', 'invoicing'),
+            'authorize_only' => __('Authorize Only', 'invoicing'),
         ),
         'std'         => 'authorize_only'
     );
@@ -557,9 +557,9 @@ 
     $setting['authorizenet_ipn_url'] = array(
             'type' => 'ipn_url',
             'id'   => 'authorizenet_ipn_url',
-            'name' => __( 'Silent Post URL', 'invoicing' ),
-            'std' => wpinv_get_ipn_url( 'authorizenet' ),
-            'desc' => __( 'If you are accepting recurring payments then you must set this url at Authorize.Net Account > Settings > Transaction Format Settings > Transaction Response Settings > Silent Post URL.', 'invoicing' ),
+            'name' => __('Silent Post URL', 'invoicing'),
+            'std' => wpinv_get_ipn_url('authorizenet'),
+            'desc' => __('If you are accepting recurring payments then you must set this url at Authorize.Net Account > Settings > Transaction Format Settings > Transaction Response Settings > Silent Post URL.', 'invoicing'),
             'size' => 'large',
             'custom' => 'authorizenet',
             'readonly' => true
@@ -567,26 +567,26 @@ 
         
     return $setting;
 }
-add_filter( 'wpinv_gateway_settings_authorizenet', 'wpinv_gateway_settings_authorizenet', 10, 1 );
+add_filter('wpinv_gateway_settings_authorizenet', 'wpinv_gateway_settings_authorizenet', 10, 1);
 
 // Worldpay settings
-function wpinv_gateway_settings_worldpay( $setting ) {
-    $setting['worldpay_active']['desc'] = $setting['worldpay_active']['desc'] . ' ' . __( '( Supported Currencies: AUD, ARS, CAD, CHF, DKK, EUR, HKD, MYR, GBP, NZD, NOK, SGD, LKR, SEK, TRY, USD, ZAR )', 'invoicing' );
-    $setting['worldpay_desc']['std'] = __( 'Pay using a Worldpay account to process Credit card / Debit card transactions.', 'invoicing' );
+function wpinv_gateway_settings_worldpay($setting) {
+    $setting['worldpay_active']['desc'] = $setting['worldpay_active']['desc'] . ' ' . __('( Supported Currencies: AUD, ARS, CAD, CHF, DKK, EUR, HKD, MYR, GBP, NZD, NOK, SGD, LKR, SEK, TRY, USD, ZAR )', 'invoicing');
+    $setting['worldpay_desc']['std'] = __('Pay using a Worldpay account to process Credit card / Debit card transactions.', 'invoicing');
     
     $setting['worldpay_sandbox'] = array(
             'type' => 'checkbox',
             'id'   => 'worldpay_sandbox',
-            'name' => __( 'Worldpay Test Mode', 'invoicing' ),
-            'desc' => __( 'This provides a special Test Environment to enable you to test your installation and integration to your website before going live.', 'invoicing' ),
+            'name' => __('Worldpay Test Mode', 'invoicing'),
+            'desc' => __('This provides a special Test Environment to enable you to test your installation and integration to your website before going live.', 'invoicing'),
             'std'  => 1
         );
         
     $setting['worldpay_instId'] = array(
             'type' => 'text',
             'id'   => 'worldpay_instId',
-            'name' => __( 'Installation Id', 'invoicing' ),
-            'desc' => __( 'Your installation id. Ex: 211616', 'invoicing' ),
+            'name' => __('Installation Id', 'invoicing'),
+            'desc' => __('Your installation id. Ex: 211616', 'invoicing'),
             'std' => '211616',
         );
     /*
@@ -602,9 +602,9 @@ 
     $setting['worldpay_ipn_url'] = array(
             'type' => 'ipn_url',
             'id'   => 'worldpay_ipn_url',
-            'name' => __( 'Worldpay Callback Url', 'invoicing' ),
-            'std' => wpinv_get_ipn_url( 'worldpay' ),
-            'desc' => wp_sprintf( __( 'Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and type "%s" or "%s" for a dynamic payment response.', 'invoicing' ), '<font style="color:#000;font-style:normal">' . wpinv_get_ipn_url( 'worldpay' ) . '</font>', '<font style="color:#000;font-style:normal">&lt;wpdisplay item=MC_callback&gt;</font>' ),
+            'name' => __('Worldpay Callback Url', 'invoicing'),
+            'std' => wpinv_get_ipn_url('worldpay'),
+            'desc' => wp_sprintf(__('Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and type "%s" or "%s" for a dynamic payment response.', 'invoicing'), '<font style="color:#000;font-style:normal">' . wpinv_get_ipn_url('worldpay') . '</font>', '<font style="color:#000;font-style:normal">&lt;wpdisplay item=MC_callback&gt;</font>'),
             'size' => 'large',
             'custom' => 'worldpay',
             'readonly' => true
@@ -612,99 +612,99 @@ 
         
     return $setting;
 }
-add_filter( 'wpinv_gateway_settings_worldpay', 'wpinv_gateway_settings_worldpay', 10, 1 );
+add_filter('wpinv_gateway_settings_worldpay', 'wpinv_gateway_settings_worldpay', 10, 1);
 
-function wpinv_ipn_url_callback( $args ) {    
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+function wpinv_ipn_url_callback($args) {    
+    $sanitize_id = wpinv_sanitize_key($args['id']);
     
     $attrs = $args['readonly'] ? ' readonly' : '';
 
-    $html = '<input style="background-color:#fefefe" type="text" ' . $attrs . ' value="' . esc_attr( $args['std'] ) . '" name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . ']" class="large-text">';
-    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']">'  . $args['desc'] . '</label>';
+    $html = '<input style="background-color:#fefefe" type="text" ' . $attrs . ' value="' . esc_attr($args['std']) . '" name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . ']" class="large-text">';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']">' . $args['desc'] . '</label>';
 
     echo $html;
 }
 
-function wpinv_is_test_mode( $gateway = '' ) {
-    if ( empty( $gateway ) ) {
+function wpinv_is_test_mode($gateway = '') {
+    if (empty($gateway)) {
         return false;
     }
     
-    $is_test_mode = wpinv_get_option( $gateway . '_sandbox', false );
+    $is_test_mode = wpinv_get_option($gateway . '_sandbox', false);
     
-    return apply_filters( 'wpinv_is_test_mode', $is_test_mode, $gateway );
+    return apply_filters('wpinv_is_test_mode', $is_test_mode, $gateway);
 }
 
-function wpinv_get_ipn_url( $gateway = '', $args = array() ) {
-    $data = array( 'wpi-listener' => 'IPN' );
+function wpinv_get_ipn_url($gateway = '', $args = array()) {
+    $data = array('wpi-listener' => 'IPN');
     
-    if ( !empty( $gateway ) ) {
-        $data['wpi-gateway'] = wpinv_sanitize_key( $gateway );
+    if (!empty($gateway)) {
+        $data['wpi-gateway'] = wpinv_sanitize_key($gateway);
     }
     
-    $args = !empty( $args ) && is_array( $args ) ? array_merge( $data, $args ) : $data;
+    $args = !empty($args) && is_array($args) ? array_merge($data, $args) : $data;
     
-    $ipn_url = add_query_arg( $args,  home_url( 'index.php' ) );
+    $ipn_url = add_query_arg($args, home_url('index.php'));
     
-    return apply_filters( 'wpinv_ipn_url', $ipn_url );
+    return apply_filters('wpinv_ipn_url', $ipn_url);
 }
 
 function wpinv_listen_for_payment_ipn() {
     // Regular PayPal IPN
-    if ( isset( $_GET['wpi-listener'] ) && $_GET['wpi-listener'] == 'IPN' ) {
-        do_action( 'wpinv_verify_payment_ipn' );
+    if (isset($_GET['wpi-listener']) && $_GET['wpi-listener'] == 'IPN') {
+        do_action('wpinv_verify_payment_ipn');
         
-        if ( !empty( $_GET['wpi-gateway'] ) ) {
-            wpinv_error_log( sanitize_text_field( $_GET['wpi-gateway'] ), 'WP Invoicing IPN', __FILE__, __LINE__ );
-            do_action( 'wpinv_verify_' . sanitize_text_field( $_GET['wpi-gateway'] ) . '_ipn' );
+        if (!empty($_GET['wpi-gateway'])) {
+            wpinv_error_log(sanitize_text_field($_GET['wpi-gateway']), 'WP Invoicing IPN', __FILE__, __LINE__);
+            do_action('wpinv_verify_' . sanitize_text_field($_GET['wpi-gateway']) . '_ipn');
         }
     }
 }
-add_action( 'init', 'wpinv_listen_for_payment_ipn' );
+add_action('init', 'wpinv_listen_for_payment_ipn');
 
 function wpinv_get_bank_instructions() {
-    $bank_instructions = wpinv_get_option( 'bank_transfer_info' );
+    $bank_instructions = wpinv_get_option('bank_transfer_info');
     
-    return apply_filters( 'wpinv_bank_instructions', $bank_instructions );
+    return apply_filters('wpinv_bank_instructions', $bank_instructions);
 }
 
-function wpinv_get_bank_info( $filtered = false ) {
+function wpinv_get_bank_info($filtered = false) {
     $bank_fields = array(
-        'bank_transfer_ac_name'     => __( 'Account Name', 'invoicing' ),
-        'bank_transfer_ac_no'       => __( 'Account Number', 'invoicing' ),
-        'bank_transfer_bank_name'   => __( 'Bank Name', 'invoicing' ),
-        'bank_transfer_ifsc'        => __( 'IFSC code', 'invoicing' ),
-        'bank_transfer_iban'        => __( 'IBAN', 'invoicing' ),
-        'bank_transfer_bic'         => __( 'BIC/Swift code', 'invoicing' ),
-        'bank_transfer_sort_code'   => __( 'Sort Code', 'invoicing' )
+        'bank_transfer_ac_name'     => __('Account Name', 'invoicing'),
+        'bank_transfer_ac_no'       => __('Account Number', 'invoicing'),
+        'bank_transfer_bank_name'   => __('Bank Name', 'invoicing'),
+        'bank_transfer_ifsc'        => __('IFSC code', 'invoicing'),
+        'bank_transfer_iban'        => __('IBAN', 'invoicing'),
+        'bank_transfer_bic'         => __('BIC/Swift code', 'invoicing'),
+        'bank_transfer_sort_code'   => __('Sort Code', 'invoicing')
     );
     
     $bank_info = array();
-    foreach ( $bank_fields as $field => $label ) {
-        if ( $filtered && !( $value = wpinv_get_option( $field ) ) ) {
+    foreach ($bank_fields as $field => $label) {
+        if ($filtered && !($value = wpinv_get_option($field))) {
             continue;
         }
         
-        $bank_info[$field] = array( 'label' => $label, 'value' => $value );
+        $bank_info[$field] = array('label' => $label, 'value' => $value);
     }
     
-    return apply_filters( 'wpinv_bank_info', $bank_info, $filtered );
+    return apply_filters('wpinv_bank_info', $bank_info, $filtered);
 }
 
-function wpinv_get_post_data( $method = 'request' ) {
+function wpinv_get_post_data($method = 'request') {
     $data       = array();
     $request    = $_REQUEST;
     
-    if ( $method == 'post' ) {
-        if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+    if ($method == 'post') {
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'POST') {
             return $data;
         }
         
         $request = $_POST;
     }
     
-    if ( $method == 'get' ) {
-        if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'GET' ) {
+    if ($method == 'get') {
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'GET') {
             return $data;
         }
         
@@ -715,11 +715,11 @@ 
     $post_data = '';
     
     // Fallback just in case post_max_size is lower than needed
-    if ( ini_get( 'allow_url_fopen' ) ) {
-        $post_data = file_get_contents( 'php://input' );
+    if (ini_get('allow_url_fopen')) {
+        $post_data = file_get_contents('php://input');
     } else {
         // If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-        ini_set( 'post_max_size', '12M' );
+        ini_set('post_max_size', '12M');
     }
     // Start the encoded data collection with notification command
     $encoded_data = 'cmd=_notify-validate';
@@ -728,58 +728,58 @@ 
     $arg_separator = wpinv_get_php_arg_separator_output();
 
     // Verify there is a post_data
-    if ( $post_data || strlen( $post_data ) > 0 ) {
+    if ($post_data || strlen($post_data) > 0) {
         // Append the data
         $encoded_data .= $arg_separator . $post_data;
     } else {
         // Check if POST is empty
-        if ( empty( $request ) ) {
+        if (empty($request)) {
             // Nothing to do
             return;
         } else {
             // Loop through each POST
-            foreach ( $request as $key => $value ) {
+            foreach ($request as $key => $value) {
                 // Encode the value and append the data
-                $encoded_data .= $arg_separator . "$key=" . urlencode( $value );
+                $encoded_data .= $arg_separator . "$key=" . urlencode($value);
             }
         }
     }
 
     // Convert collected post data to an array
-    wp_parse_str( $encoded_data, $data );
+    wp_parse_str($encoded_data, $data);
 
-    foreach ( $data as $key => $value ) {
-        if ( false !== strpos( $key, 'amp;' ) ) {
-            $new_key = str_replace( '&amp;', '&', $key );
-            $new_key = str_replace( 'amp;', '&' , $new_key );
+    foreach ($data as $key => $value) {
+        if (false !== strpos($key, 'amp;')) {
+            $new_key = str_replace('&amp;', '&', $key);
+            $new_key = str_replace('amp;', '&', $new_key);
 
-            unset( $data[ $key ] );
-            $data[ $new_key ] = sanitize_text_field( $value );
+            unset($data[$key]);
+            $data[$new_key] = sanitize_text_field($value);
         }
     }
     
     return $data;
 }
 
-function wpinv_gateway_support_subscription( $gateway ) {
+function wpinv_gateway_support_subscription($gateway) {
     $return = false;
     
-    if ( wpinv_is_gateway_active( $gateway ) ) {
-        $return = apply_filters( 'wpinv_' . $gateway . '_support_subscription', false );
+    if (wpinv_is_gateway_active($gateway)) {
+        $return = apply_filters('wpinv_' . $gateway . '_support_subscription', false);
     }
     
     return $return;
 }
 
-function wpinv_payment_gateways_on_cart( $gateways = array() ) {
-    if ( !empty( $gateways ) && wpinv_cart_has_recurring_item() ) {
-        foreach ( $gateways as $gateway => $info ) {
-            if ( !wpinv_gateway_support_subscription( $gateway ) ) {
-                unset( $gateways[$gateway] );
+function wpinv_payment_gateways_on_cart($gateways = array()) {
+    if (!empty($gateways) && wpinv_cart_has_recurring_item()) {
+        foreach ($gateways as $gateway => $info) {
+            if (!wpinv_gateway_support_subscription($gateway)) {
+                unset($gateways[$gateway]);
             }
         }
     }
     
     return $gateways;
 }
-add_filter( 'wpinv_payment_gateways_on_cart', 'wpinv_payment_gateways_on_cart', 10, 1 );
\ No newline at end of file
+add_filter('wpinv_payment_gateways_on_cart', 'wpinv_payment_gateways_on_cart', 10, 1);
\ No newline at end of file

includes/class-wpinv-ajax.php

Braces +1 added lines, -1 removed lines

@@ -512,7 +512,7 @@
             
             $response['success'] = true;
             $response['msg'] = __( 'Discount has been applied successfully.', 'invoicing' );
-        }  else {
+        } else {
             $errors = wpinv_get_errors();
             if ( !empty( $errors['wpinv-discount-error'] ) ) {
                 $response['msg'] = $errors['wpinv-discount-error'];

Indentation +11 added lines, -11 removed lines

@@ -714,24 +714,24 @@
         }
 
         // Is the request set up correctly?
-		if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
-			echo aui()->alert(
-				array(
-					'type'    => 'warning',
-					'content' => __( 'No payment form or item provided', 'invoicing' ),
-				)
+        if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+            echo aui()->alert(
+                array(
+                    'type'    => 'warning',
+                    'content' => __( 'No payment form or item provided', 'invoicing' ),
+                )
             );
             exit;
         }
 
         // Payment form or button?
-		if ( ! empty( $_GET['form'] ) ) {
+        if ( ! empty( $_GET['form'] ) ) {
             echo getpaid_display_payment_form( $_GET['form'] );
-		} else if( $_GET['invoice'] ) {
-		    echo getpaid_display_invoice_payment_form( $_GET['invoice'] );
+        } else if( $_GET['invoice'] ) {
+            echo getpaid_display_invoice_payment_form( $_GET['invoice'] );
         } else {
-			$items = getpaid_convert_items_to_array( $_GET['item'] );
-		    echo getpaid_display_item_payment_form( $items );
+            $items = getpaid_convert_items_to_array( $_GET['item'] );
+            echo getpaid_display_item_payment_form( $items );
         }
         
         exit;

Spacing +353 added lines, -353 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 ) ) {
-                /** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
+            if (!WP_DEBUG || (WP_DEBUG && !WP_DEBUG_DISPLAY)) {
+                /** @scrutinizer ignore-unhandled */ @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();
-        /** @scrutinizer ignore-unhandled */ @header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-        /** @scrutinizer ignore-unhandled */ @header( 'X-Robots-Tag: noindex' );
+        /** @scrutinizer ignore-unhandled */ @header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+        /** @scrutinizer ignore-unhandled */ @header('X-Robots-Tag: noindex');
         send_nosniff_header();
         nocache_headers();
-        status_header( 200 );
+        status_header(200);
     }
     
     public static function add_ajax_events() {
@@ -81,41 +81,41 @@ 
             'payment_form_refresh_prices' => true,
         );
 
-        foreach ( $ajax_events as $ajax_event => $nopriv ) {
-            add_action( 'wp_ajax_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-            add_action( 'wp_ajax_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+        foreach ($ajax_events as $ajax_event => $nopriv) {
+            add_action('wp_ajax_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+            add_action('wp_ajax_getpaid_' . $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 ) );
-                add_action( 'wp_ajax_nopriv_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+            if ($nopriv) {
+                add_action('wp_ajax_nopriv_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+                add_action('wp_ajax_nopriv_getpaid_' . $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 ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             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);
             }
         }
 
@@ -123,16 +123,16 @@ 
     }
 
     public static function delete_note() {
-        check_ajax_referer( 'delete-invoice-note', '_nonce' );
+        check_ajax_referer('delete-invoice-note', '_nonce');
 
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
-        $note_id = (int)$_POST['note_id'];
+        $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();
@@ -145,8 +145,8 @@ 
     }
     
     public static function checkout() {
-        if ( ! defined( 'WPINV_CHECKOUT' ) ) {
-            define( 'WPINV_CHECKOUT', true );
+        if (!defined('WPINV_CHECKOUT')) {
+            define('WPINV_CHECKOUT', true);
         }
 
         wpinv_process_checkout();
@@ -155,53 +155,53 @@ 
     
     public static function add_invoice_item() {
         global $wpi_userID, $wpinv_ip_address_country;
-        check_ajax_referer( 'invoice-item', '_nonce' );
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('invoice-item', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             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);
             }
         }
         
@@ -209,11 +209,11 @@ 
         
         $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;
+        $quantity = wpinv_item_quantities_enabled() && !empty($_POST['qty']) && (int) $_POST['qty'] > 0 ? (int) $_POST['qty'] : 1;
 
         $args = array(
             'id'            => $item_id,
@@ -226,21 +226,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;
 
@@ -248,7 +248,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();
@@ -260,41 +260,41 @@ 
         
         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 ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('invoice-item', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             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();
         }
         
@@ -302,9 +302,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,
@@ -312,21 +312,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;
         
@@ -334,7 +334,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();
@@ -346,55 +346,55 @@ 
         
         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 ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('invoice-item', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             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 = wp_unslash( $_POST['_wpinv_quick'] );
+        $save_item = wp_unslash($_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';
         
         $data                   = array();
         $data['post_title']     = sanitize_text_field($save_item['name']);
         $data['post_status']    = 'publish';
-        $data['post_excerpt']   = ! empty( $save_item['excerpt'] ) ? wp_kses_post( $save_item['excerpt'] ) : '';
+        $data['post_excerpt']   = !empty($save_item['excerpt']) ? wp_kses_post($save_item['excerpt']) : '';
         $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;
+            $_POST['qty']       = !empty($save_item['qty']) && $save_item['qty'] > 0 ? (int) $save_item['qty'] : 1;
             
             self::add_invoice_item();
         }
@@ -402,15 +402,15 @@ 
     }
     
     public static function get_billing_details() {
-        check_ajax_referer( 'get-billing-details', '_nonce' );
+        check_ajax_referer('get-billing-details', '_nonce');
         
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
-        $user_id            = (int)$_POST['user_id'];
+        $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']);
@@ -424,20 +424,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 ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             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();
         }
 
@@ -445,29 +445,29 @@ 
 
         $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();
         }
 
         $disable_taxes = 0;
-        if ( ! empty( $_POST['disable_taxes'] ) ) {
+        if (!empty($_POST['disable_taxes'])) {
             $disable_taxes = 1;
         }
-        $invoice->set( 'disable_taxes', $disable_taxes );
+        $invoice->set('disable_taxes', $disable_taxes);
 
-        $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;
@@ -476,7 +476,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();
@@ -488,25 +488,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 ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             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();
         }
         
@@ -514,49 +514,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 ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             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();
         }
         
@@ -564,38 +564,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 ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             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']);
@@ -611,54 +611,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 ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             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;
@@ -667,29 +667,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;
@@ -698,10 +698,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);
     }
 
     /**
@@ -710,30 +710,30 @@ 
     public static function get_payment_form() {
 
         // Check nonce.
-        if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'], 'getpaid_ajax_form' ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (!isset($_GET['nonce']) || !wp_verify_nonce($_GET['nonce'], 'getpaid_ajax_form')) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
         // Is the request set up correctly?
-		if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+		if (empty($_GET['form']) && empty($_GET['item'])) {
 			echo aui()->alert(
 				array(
 					'type'    => 'warning',
-					'content' => __( 'No payment form or item provided', 'invoicing' ),
+					'content' => __('No payment form or item provided', 'invoicing'),
 				)
             );
             exit;
         }
 
         // Payment form or button?
-		if ( ! empty( $_GET['form'] ) ) {
-            echo getpaid_display_payment_form( $_GET['form'] );
-		} else if( $_GET['invoice'] ) {
-		    echo getpaid_display_invoice_payment_form( $_GET['invoice'] );
+		if (!empty($_GET['form'])) {
+            echo getpaid_display_payment_form($_GET['form']);
+		} else if ($_GET['invoice']) {
+		    echo getpaid_display_invoice_payment_form($_GET['invoice']);
         } else {
-			$items = getpaid_convert_items_to_array( $_GET['item'] );
-		    echo getpaid_display_item_payment_form( $items );
+			$items = getpaid_convert_items_to_array($_GET['item']);
+		    echo getpaid_display_item_payment_form($items);
         }
         
         exit;
@@ -749,11 +749,11 @@ 
         global $invoicing, $wpi_checkout_id, $cart_total;
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
@@ -761,25 +761,25 @@ 
         $submission = new GetPaid_Payment_Form_Submission();
 
         // Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
+        if (!empty($submission->last_error)) {
             echo $submission->last_error;
             exit;
         }
 
         // We need a billing email.
-        if ( ! $submission->has_billing_email() || ! is_email( $submission->get_billing_email() ) ) {
-            wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
+        if (!$submission->has_billing_email() || !is_email($submission->get_billing_email())) {
+            wp_send_json_error(__('Provide a valid billing email.', 'invoicing'));
         }
 
         // Prepare items.
         $items            = $submission->get_items();
         $prepared_items   = array();
 
-        if ( ! empty( $items ) ) {
+        if (!empty($items)) {
 
-            foreach( $items as $item_id => $item ) {
+            foreach ($items as $item_id => $item) {
 
-                if ( $item->can_purchase() ) {
+                if ($item->can_purchase()) {
                     $prepared_items[] = array(
                         'id'           => $item_id,
                         'item_price'   => $item->get_price(),
@@ -793,90 +793,90 @@ 
 
         }
 
-        if ( empty( $prepared_items ) ) {
-            wp_send_json_error( __( 'You have not selected any items.', 'invoicing' ) );
+        if (empty($prepared_items)) {
+            wp_send_json_error(__('You have not selected any items.', 'invoicing'));
         }
 
-        if ( $submission->has_recurring && 1 != count( $prepared_items ) ) {
-            wp_send_json_error( __( 'Recurring items should be bought individually.', 'invoicing' ) );
+        if ($submission->has_recurring && 1 != count($prepared_items)) {
+            wp_send_json_error(__('Recurring items should be bought individually.', 'invoicing'));
         }
 
         // Prepare the submission details.
         $prepared = array(
-            'billing_email'                    => sanitize_email( $submission->get_billing_email() ),
-            __( 'Billing Email', 'invoicing' ) => sanitize_email( $submission->get_billing_email() ),
-            __( 'Form Id', 'invoicing' )       => absint( $submission->payment_form->get_id() ),
+            'billing_email'                    => sanitize_email($submission->get_billing_email()),
+            __('Billing Email', 'invoicing') => sanitize_email($submission->get_billing_email()),
+            __('Form Id', 'invoicing')       => absint($submission->payment_form->get_id()),
         );
 
         // Address fields.
         $address_fields = array();
 
         // Add discount code.
-        if ( $submission->has_discount_code() ) {
-            $address_fields['discount'] = array( $submission->get_discount_code() );
+        if ($submission->has_discount_code()) {
+            $address_fields['discount'] = array($submission->get_discount_code());
         }
 
         // Are all required fields provided?
         $data = $submission->get_data();
 
-        foreach ( $submission->payment_form->get_elements() as $field ) {
+        foreach ($submission->payment_form->get_elements() as $field) {
 
-            if ( ! empty( $field['premade'] ) ) {
+            if (!empty($field['premade'])) {
                 continue;
             }
 
-            if ( ! $submission->is_required_field_set( $field ) ) {
-                wp_send_json_error( __( 'Fill all required fields.', 'invoicing' ) );
+            if (!$submission->is_required_field_set($field)) {
+                wp_send_json_error(__('Fill all required fields.', 'invoicing'));
             }
 
-            if ( $field['type'] == 'address' ) {
+            if ($field['type'] == 'address') {
 
-                foreach ( $field['fields'] as $address_field ) {
+                foreach ($field['fields'] as $address_field) {
 
-                    if ( empty( $address_field['visible'] ) ) {
+                    if (empty($address_field['visible'])) {
                         continue;
                     }
 
-                    if ( ! empty( $address_field['required'] ) && empty( $data[ $address_field['name'] ] ) ) {
-                        wp_send_json_error( __( 'Some required fields have not been filled.', 'invoicing' ) );
+                    if (!empty($address_field['required']) && empty($data[$address_field['name']])) {
+                        wp_send_json_error(__('Some required fields have not been filled.', 'invoicing'));
                     }
 
-                    if ( isset( $data[ $address_field['name'] ] ) ) {
-                        $label = str_replace( 'wpinv_', '', $address_field['name'] );
-                        $address_fields[ $label ] = wpinv_clean( $data[ $address_field['name'] ] );
+                    if (isset($data[$address_field['name']])) {
+                        $label = str_replace('wpinv_', '', $address_field['name']);
+                        $address_fields[$label] = wpinv_clean($data[$address_field['name']]);
                     }
 
                 }
 
-            } else if ( isset( $data[ $field['id'] ] ) ) {
+            } else if (isset($data[$field['id']])) {
                 $label = $field['id'];
 
-                if ( isset( $field['label'] ) ) {
+                if (isset($field['label'])) {
                     $label = $field['label'];
                 }
 
-                $prepared[ wpinv_clean( $label ) ] = wpinv_clean( $data[ $field['id'] ] );
+                $prepared[wpinv_clean($label)] = wpinv_clean($data[$field['id']]);
             }
 
         }
 
         // (Maybe) create the user.
-        $user = get_user_by( 'email', $prepared['billing_email'] );
+        $user = get_user_by('email', $prepared['billing_email']);
 
-        if ( empty( $user ) ) {
-            $user = wpinv_create_user( $prepared['billing_email'] );
+        if (empty($user)) {
+            $user = wpinv_create_user($prepared['billing_email']);
         }
 
-        if ( is_wp_error( $user ) ) {
-            wp_send_json_error( $user->get_error_message() );
+        if (is_wp_error($user)) {
+            wp_send_json_error($user->get_error_message());
         }
 
-        if ( is_numeric( $user ) ) {
-            $user = get_user_by( 'id', $user );
+        if (is_numeric($user)) {
+            $user = get_user_by('id', $user);
         }
 
         // Create the invoice.
-        if ( ! $submission->has_invoice() ) {
+        if (!$submission->has_invoice()) {
 
             $invoice = wpinv_insert_invoice(
                 array(
@@ -893,8 +893,8 @@ 
 
             $invoice = $submission->get_invoice();
 
-            if ( $invoice->is_paid() ) {
-                wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+            if ($invoice->is_paid()) {
+                wp_send_json_error(__('This invoice has already been paid for.', 'invoicing'));
             }
 
             $invoice = wpinv_update_invoice(
@@ -909,34 +909,34 @@ 
 
         }
 
-        if ( is_wp_error( $invoice ) ) {
-            wp_send_json_error( $invoice->get_error_message() );
+        if (is_wp_error($invoice)) {
+            wp_send_json_error($invoice->get_error_message());
         }
 
-        if ( empty( $invoice ) ) {
-            wp_send_json_error( __( 'Could not create your invoice.', 'invoicing' ) );
+        if (empty($invoice)) {
+            wp_send_json_error(__('Could not create your invoice.', 'invoicing'));
         }
 
-        unset( $prepared['billing_email'] );
-        update_post_meta( $invoice->ID, 'payment_form_data', $prepared );
+        unset($prepared['billing_email']);
+        update_post_meta($invoice->ID, 'payment_form_data', $prepared);
 
         $wpi_checkout_id = $invoice->ID;
         $cart_total = wpinv_price(
             wpinv_format_amount(
-                wpinv_get_cart_total( $invoice->get_cart_details(), NULL, $invoice ) ),
+                wpinv_get_cart_total($invoice->get_cart_details(), NULL, $invoice) ),
                 $invoice->get_currency()
         );
 
         $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 );
-        add_filter( 'wp_redirect', array( $invoicing->form_elements, 'send_redirect_response' ) );
-        add_action( 'wpinv_pre_send_back_to_checkout', array( $invoicing->form_elements, 'checkout_error' ) );
+        wpinv_set_checkout_session($data);
+        add_filter('wp_redirect', array($invoicing->form_elements, 'send_redirect_response'));
+        add_action('wpinv_pre_send_back_to_checkout', array($invoicing->form_elements, 'checkout_error'));
         
-        if ( ! defined( 'WPINV_CHECKOUT' ) ) {
-            define( 'WPINV_CHECKOUT', true );
+        if (!defined('WPINV_CHECKOUT')) {
+            define('WPINV_CHECKOUT', true);
         }
 
         wpinv_process_checkout();
@@ -954,51 +954,51 @@ 
     public static function get_payment_form_states_field() {
         global $invoicing;
 
-        if ( empty( $_GET['country'] ) || empty( $_GET['form'] ) ) {
+        if (empty($_GET['country']) || empty($_GET['form'])) {
             exit;
         }
 
-        $elements = $invoicing->form_elements->get_form_elements( $_GET['form'] );
+        $elements = $invoicing->form_elements->get_form_elements($_GET['form']);
 
-        if ( empty( $elements ) ) {
+        if (empty($elements)) {
             exit;
         }
 
         $address_fields = array();
-        foreach ( $elements as $element ) {
-            if ( 'address' === $element['type'] ) {
+        foreach ($elements as $element) {
+            if ('address' === $element['type']) {
                 $address_fields = $element;
                 break;
             }
         }
 
-        if ( empty( $address_fields ) ) {
+        if (empty($address_fields)) {
             exit;
         }
 
-        foreach( $address_fields['fields'] as $address_field ) {
+        foreach ($address_fields['fields'] as $address_field) {
 
-            if ( 'wpinv_state' == $address_field['name'] ) {
+            if ('wpinv_state' == $address_field['name']) {
 
                 $label = $address_field['label'];
 
-                if ( ! empty( $address_field['required'] ) ) {
+                if (!empty($address_field['required'])) {
                     $label .= "<span class='text-danger'> *</span>";
                 }
 
-                $states = wpinv_get_country_states( $_GET['country'] );
+                $states = wpinv_get_country_states($_GET['country']);
 
-                if ( ! empty( $states ) ) {
+                if (!empty($states)) {
 
                     $html = aui()->select(
                             array(
                                 'options'          => $states,
-                                'name'             => esc_attr( $address_field['name'] ),
-                                'id'               => esc_attr( $address_field['name'] ),
-                                'placeholder'      => esc_attr( $address_field['placeholder'] ),
+                                'name'             => esc_attr($address_field['name']),
+                                'id'               => esc_attr($address_field['name']),
+                                'placeholder'      => esc_attr($address_field['placeholder']),
                                 'required'         => (bool) $address_field['required'],
                                 'no_wrap'          => true,
-                                'label'            => wp_kses_post( $label ),
+                                'label'            => wp_kses_post($label),
                                 'select2'          => false,
                             )
                         );
@@ -1007,10 +1007,10 @@ 
 
                     $html = aui()->input(
                             array(
-                                'name'       => esc_attr( $address_field['name'] ),
-                                'id'         => esc_attr( $address_field['name'] ),
+                                'name'       => esc_attr($address_field['name']),
+                                'id'         => esc_attr($address_field['name']),
                                 'required'   => (bool) $address_field['required'],
-                                'label'      => wp_kses_post( $label ),
+                                'label'      => wp_kses_post($label),
                                 'no_wrap'    => true,
                                 'type'       => 'text',
                             )
@@ -1018,7 +1018,7 @@ 
 
                 }
 
-                wp_send_json_success( str_replace( 'sr-only', '', $html ) );
+                wp_send_json_success(str_replace('sr-only', '', $html));
                 exit;
 
             }
@@ -1036,11 +1036,11 @@ 
     public static function payment_form_refresh_prices() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
@@ -1048,7 +1048,7 @@ 
         $submission = new GetPaid_Payment_Form_Submission();
 
         // Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
+        if (!empty($submission->last_error)) {
             echo $submission->last_error;
             exit;
         }
@@ -1059,38 +1059,38 @@ 
             'has_recurring' => $submission->has_recurring,
             'is_free'       => $submission->get_payment_details(),
             'totals'        => array(
-                'subtotal'  => wpinv_price( wpinv_format_amount( $submission->subtotal_amount ), $submission->get_currency() ),
-                'discount'  => wpinv_price( wpinv_format_amount( $submission->get_total_discount() ), $submission->get_currency() ),
-                'fees'      => wpinv_price( wpinv_format_amount( $submission->get_total_fees() ), $submission->get_currency() ),
-                'tax'       => wpinv_price( wpinv_format_amount( $submission->get_total_tax() ), $submission->get_currency() ),
-                'total'     => wpinv_price( wpinv_format_amount( $submission->get_total() ), $submission->get_currency() ),
+                'subtotal'  => wpinv_price(wpinv_format_amount($submission->subtotal_amount), $submission->get_currency()),
+                'discount'  => wpinv_price(wpinv_format_amount($submission->get_total_discount()), $submission->get_currency()),
+                'fees'      => wpinv_price(wpinv_format_amount($submission->get_total_fees()), $submission->get_currency()),
+                'tax'       => wpinv_price(wpinv_format_amount($submission->get_total_tax()), $submission->get_currency()),
+                'total'     => wpinv_price(wpinv_format_amount($submission->get_total()), $submission->get_currency()),
             ),
         );
 
         // Add items.
         $items = $submission->get_items();
-        if ( ! empty( $items ) ) {
+        if (!empty($items)) {
             $result['items'] = array();
 
-            foreach( $items as $item_id => $item ) {
-                $result['items']["$item_id"] = wpinv_price( wpinv_format_amount( $item->get_price() * $item->get_qantity() ) );
+            foreach ($items as $item_id => $item) {
+                $result['items']["$item_id"] = wpinv_price(wpinv_format_amount($item->get_price() * $item->get_qantity()));
             }
         }
 
         // Add invoice.
-        if ( $submission->has_invoice() ) {
+        if ($submission->has_invoice()) {
             $result['invoice'] = $submission->get_invoice()->ID;
         }
 
         // Add discount code.
-        if ( $submission->has_discount_code() ) {
+        if ($submission->has_discount_code()) {
             $result['discount_code'] = $submission->get_discount_code();
         }
 
         // Filter the result.
-        $result = apply_filters( 'getpaid_payment_form_ajax_refresh_prices', $result, $submission );
+        $result = apply_filters('getpaid_payment_form_ajax_refresh_prices', $result, $submission);
 
-        wp_send_json_success( $result );
+        wp_send_json_success($result);
     }
 
     /**
@@ -1101,53 +1101,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
+                            '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;
                         }
 
@@ -1163,37 +1163,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'];
+                            $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'];
                             }
 
@@ -1201,17 +1201,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',
@@ -1219,21 +1219,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')
+                ));
             }
         }
 

includes/wpinv-discount-functions.php

Indentation +2 added lines, -2 removed lines

@@ -887,8 +887,8 @@
     if ( !empty( $data ) && isset( $data['cart_discounts'] ) ) {
         unset( $data['cart_discounts'] );
         
-         wpinv_set_checkout_session( $data );
-         return true;
+            wpinv_set_checkout_session( $data );
+            return true;
     }
     
     return false;

Spacing +398 added lines, -398 removed lines

@@ -7,110 +7,110 @@ 
  */
 
 // 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_get_discount_types() {
     $discount_types = array(
-                        'percent'   => __( 'Percentage', 'invoicing' ),
-                        'flat'     => __( 'Flat Amount', 'invoicing' ),
+                        'percent'   => __('Percentage', 'invoicing'),
+                        'flat'     => __('Flat Amount', 'invoicing'),
                     );
-    return (array)apply_filters( 'wpinv_discount_types', $discount_types );
+    return (array) apply_filters('wpinv_discount_types', $discount_types);
 }
 
-function wpinv_get_discount_type_name( $type = '' ) {
+function wpinv_get_discount_type_name($type = '') {
     $types = wpinv_get_discount_types();
-    return isset( $types[ $type ] ) ? $types[ $type ] : '';
+    return isset($types[$type]) ? $types[$type] : '';
 }
 
-function wpinv_delete_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_delete_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! wpinv_current_user_can_manage_invoicing() ) {
-        wp_die( __( 'You do not have permission to delete discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!wpinv_current_user_can_manage_invoicing()) {
+        wp_die(__('You do not have permission to delete discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     $discount_id = $data['discount'];
-    wpinv_remove_discount( $discount_id );
+    wpinv_remove_discount($discount_id);
 }
-add_action( 'wpinv_delete_discount', 'wpinv_delete_discount' );
+add_action('wpinv_delete_discount', 'wpinv_delete_discount');
 
-function wpinv_activate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_activate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! wpinv_current_user_can_manage_invoicing() ) {
-        wp_die( __( 'You do not have permission to edit discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!wpinv_current_user_can_manage_invoicing()) {
+        wp_die(__('You do not have permission to edit discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'publish' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'publish');
 }
-add_action( 'wpinv_activate_discount', 'wpinv_activate_discount' );
+add_action('wpinv_activate_discount', 'wpinv_activate_discount');
 
-function wpinv_deactivate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_deactivate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! wpinv_current_user_can_manage_invoicing() ) {
-        wp_die( __( 'You do not have permission to create discount codes', 'invoicing' ), array( 'response' => 403 ) );
+    if (!wpinv_current_user_can_manage_invoicing()) {
+        wp_die(__('You do not have permission to create discount codes', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'pending' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'pending');
 }
-add_action( 'wpinv_deactivate_discount', 'wpinv_deactivate_discount' );
+add_action('wpinv_deactivate_discount', 'wpinv_deactivate_discount');
 
-function wpinv_get_discounts( $args = array() ) {
+function wpinv_get_discounts($args = array()) {
     $defaults = array(
         'post_type'      => 'wpi_discount',
         'posts_per_page' => 20,
         'paged'          => null,
-        'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+        'post_status'    => array('publish', 'pending', 'draft', 'expired')
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $discounts = get_posts( $args );
+    $discounts = get_posts($args);
 
-    if ( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
-    if( ! $discounts && ! empty( $args['s'] ) ) {
+    if (!$discounts && !empty($args['s'])) {
         $args['meta_key']     = '_wpi_discount_code';
         $args['meta_value']   = $args['s'];
         $args['meta_compare'] = 'LIKE';
-        unset( $args['s'] );
-        $discounts = get_posts( $args );
+        unset($args['s']);
+        $discounts = get_posts($args);
     }
 
-    if( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
     return false;
 }
 
-function wpinv_get_all_discounts( $args = array() ) {
+function wpinv_get_all_discounts($args = array()) {
 
-    $args = wp_parse_args( $args, array(
-        'status'         => array( 'publish' ),
-        'limit'          => get_option( 'posts_per_page' ),
+    $args = wp_parse_args($args, array(
+        'status'         => array('publish'),
+        'limit'          => get_option('posts_per_page'),
         'page'           => 1,
         'exclude'        => array(),
         'orderby'        => 'date',
         'order'          => 'DESC',
-        'type'           => array_keys( wpinv_get_discount_types() ),
+        'type'           => array_keys(wpinv_get_discount_types()),
         'meta_query'     => array(),
         'return'         => 'objects',
         'paginate'       => false,
-    ) );
+    ));
 
     $wp_query_args = array(
         'post_type'      => 'wpi_discount',
@@ -120,18 +120,18 @@ 
         'fields'         => 'ids',
         'orderby'        => $args['orderby'],
         'order'          => $args['order'],
-        'paged'          => absint( $args['page'] ),
+        'paged'          => absint($args['page']),
     );
 
-    if ( ! empty( $args['exclude'] ) ) {
-        $wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+    if (!empty($args['exclude'])) {
+        $wp_query_args['post__not_in'] = array_map('absint', $args['exclude']);
     }
 
-    if ( ! $args['paginate' ] ) {
+    if (!$args['paginate']) {
         $wp_query_args['no_found_rows'] = true;
     }
 
-    if ( ! empty( $args['search'] ) ) {
+    if (!empty($args['search'])) {
 
         $wp_query_args['meta_query'][] = array(
             'key'     => '_wpi_discount_code',
@@ -141,11 +141,11 @@ 
 
     }
 
-    if ( ! empty( $args['type'] ) ) {
-        $types = wpinv_parse_list( $args['type'] );
+    if (!empty($args['type'])) {
+        $types = wpinv_parse_list($args['type']);
         $wp_query_args['meta_query'][] = array(
             'key'     => '_wpi_discount_type',
-            'value'   => implode( ',', $types ),
+            'value'   => implode(',', $types),
             'compare' => 'IN',
         );
     }
@@ -153,17 +153,17 @@ 
     $wp_query_args = apply_filters('wpinv_get_discount_args', $wp_query_args, $args);
 
     // Get results.
-    $discounts = new WP_Query( $wp_query_args );
+    $discounts = new WP_Query($wp_query_args);
 
-    if ( 'objects' === $args['return'] ) {
-        $return = array_map( 'get_post', $discounts->posts );
-    } elseif ( 'self' === $args['return'] ) {
+    if ('objects' === $args['return']) {
+        $return = array_map('get_post', $discounts->posts);
+    } elseif ('self' === $args['return']) {
         return $discounts;
     } else {
         $return = $discounts->posts;
     }
 
-    if ( $args['paginate' ] ) {
+    if ($args['paginate']) {
         return (object) array(
             'discounts'      => $return,
             'total'         => $discounts->found_posts,
@@ -180,9 +180,9 @@ 
 
     $discounts  = wpinv_get_discounts();
 
-    if ( $discounts) {
-        foreach ( $discounts as $discount ) {
-            if ( wpinv_is_discount_active( $discount->ID, true ) ) {
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            if (wpinv_is_discount_active($discount->ID, true)) {
                 $has_active = true;
                 break;
             }
@@ -191,16 +191,16 @@ 
     return $has_active;
 }
 
-function wpinv_get_discount( $discount_id = 0 ) {
-    if( empty( $discount_id ) ) {
+function wpinv_get_discount($discount_id = 0) {
+    if (empty($discount_id)) {
         return false;
     }
 
-    if ( get_post_type( $discount_id ) != 'wpi_discount' ) {
+    if (get_post_type($discount_id) != 'wpi_discount') {
         return false;
     }
 
-    $discount = get_post( $discount_id );
+    $discount = get_post($discount_id);
 
     return $discount;
 }
@@ -212,8 +212,8 @@ 
  * @since 1.0.15
  * @return WPInv_Discount
  */
-function wpinv_get_discount_obj( $discount = 0 ) {
-    return new WPInv_Discount( $discount );
+function wpinv_get_discount_obj($discount = 0) {
+    return new WPInv_Discount($discount);
 }
 
 /**
@@ -222,8 +222,8 @@ 
  * @param string $code The discount code.
  * @return bool|WP_Post
  */
-function wpinv_get_discount_by_code( $code = '' ) {
-    return wpinv_get_discount_by( 'code', $code );
+function wpinv_get_discount_by_code($code = '') {
+    return wpinv_get_discount_by('code', $code);
 }
 
 /**
@@ -233,13 +233,13 @@ 
  * @param string|int $value The field value
  * @return bool|WP_Post
  */
-function wpinv_get_discount_by( $field = '', $value = '' ) {
-    $data = WPInv_Discount::get_data_by( $field, $value );
-    if( empty( $data ) ) {
+function wpinv_get_discount_by($field = '', $value = '') {
+    $data = WPInv_Discount::get_data_by($field, $value);
+    if (empty($data)) {
         return false;
     }
 
-    return get_post( $data['ID'] );
+    return get_post($data['ID']);
 }
 
 /**
@@ -249,68 +249,68 @@ 
  * @param array $data The discount's properties.
  * @return bool
  */
-function wpinv_store_discount( $post_id, $data, $post, $update = false ) {
+function wpinv_store_discount($post_id, $data, $post, $update = false) {
     $meta = array(
-        'code'              => isset( $data['code'] )             ? sanitize_text_field( $data['code'] )              : '',
-        'type'              => isset( $data['type'] )             ? sanitize_text_field( $data['type'] )              : 'percent',
-        'amount'            => isset( $data['amount'] )           ? wpinv_sanitize_amount( $data['amount'] )          : '',
-        'start'             => isset( $data['start'] )            ? sanitize_text_field( $data['start'] )             : '',
-        'expiration'        => isset( $data['expiration'] )       ? sanitize_text_field( $data['expiration'] )        : '',
-        'min_total'         => isset( $data['min_total'] )        ? wpinv_sanitize_amount( $data['min_total'] )       : '',
-        'max_total'         => isset( $data['max_total'] )        ? wpinv_sanitize_amount( $data['max_total'] )       : '',
-        'max_uses'          => isset( $data['max_uses'] )         ? absint( $data['max_uses'] )                       : '',
-        'items'             => isset( $data['items'] )            ? $data['items']                                    : array(),
-        'excluded_items'    => isset( $data['excluded_items'] )   ? $data['excluded_items']                           : array(),
-        'is_recurring'      => isset( $data['recurring'] )        ? (bool)$data['recurring']                          : false,
-        'is_single_use'     => isset( $data['single_use'] )       ? (bool)$data['single_use']                         : false,
-        'uses'              => isset( $data['uses'] )             ? (int)$data['uses']                                : false,
+        'code'              => isset($data['code']) ? sanitize_text_field($data['code']) : '',
+        'type'              => isset($data['type']) ? sanitize_text_field($data['type']) : 'percent',
+        'amount'            => isset($data['amount']) ? wpinv_sanitize_amount($data['amount']) : '',
+        'start'             => isset($data['start']) ? sanitize_text_field($data['start']) : '',
+        'expiration'        => isset($data['expiration']) ? sanitize_text_field($data['expiration']) : '',
+        'min_total'         => isset($data['min_total']) ? wpinv_sanitize_amount($data['min_total']) : '',
+        'max_total'         => isset($data['max_total']) ? wpinv_sanitize_amount($data['max_total']) : '',
+        'max_uses'          => isset($data['max_uses']) ? absint($data['max_uses']) : '',
+        'items'             => isset($data['items']) ? $data['items'] : array(),
+        'excluded_items'    => isset($data['excluded_items']) ? $data['excluded_items'] : array(),
+        'is_recurring'      => isset($data['recurring']) ? (bool) $data['recurring'] : false,
+        'is_single_use'     => isset($data['single_use']) ? (bool) $data['single_use'] : false,
+        'uses'              => isset($data['uses']) ? (int) $data['uses'] : false,
     );
 
-    if ( $meta['type'] == 'percent' && (float)$meta['amount'] > 100 ) {
+    if ($meta['type'] == 'percent' && (float) $meta['amount'] > 100) {
         $meta['amount'] = 100;
     }
 
-    if ( !empty( $meta['start'] ) ) {
-        $meta['start']      = date_i18n( 'Y-m-d H:i:s', strtotime( $meta['start'] ) );
+    if (!empty($meta['start'])) {
+        $meta['start'] = date_i18n('Y-m-d H:i:s', strtotime($meta['start']));
     }
 
-    if ( !empty( $meta['expiration'] ) ) {
-        $meta['expiration'] = date_i18n( 'Y-m-d H:i:s', strtotime( $meta['expiration'] ) );
+    if (!empty($meta['expiration'])) {
+        $meta['expiration'] = date_i18n('Y-m-d H:i:s', strtotime($meta['expiration']));
 
-        if ( !empty( $meta['start'] ) && strtotime( $meta['start'] ) > strtotime( $meta['expiration'] ) ) {
+        if (!empty($meta['start']) && strtotime($meta['start']) > strtotime($meta['expiration'])) {
             $meta['expiration'] = $meta['start'];
         }
     }
 
-    if ( $meta['uses'] === false ) {
-        unset( $meta['uses'] );
+    if ($meta['uses'] === false) {
+        unset($meta['uses']);
     }
 
-    if ( ! empty( $meta['items'] ) ) {
-        foreach ( $meta['items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['items'][ $key ] );
+    if (!empty($meta['items'])) {
+        foreach ($meta['items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['items'][$key]);
             }
         }
     }
 
-    if ( ! empty( $meta['excluded_items'] ) ) {
-        foreach ( $meta['excluded_items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['excluded_items'][ $key ] );
+    if (!empty($meta['excluded_items'])) {
+        foreach ($meta['excluded_items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['excluded_items'][$key]);
             }
         }
     }
 
-    $meta = apply_filters( 'wpinv_update_discount', $meta, $post_id, $post );
+    $meta = apply_filters('wpinv_update_discount', $meta, $post_id, $post);
 
-    do_action( 'wpinv_pre_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_pre_update_discount', $meta, $post_id, $post);
 
-    foreach( $meta as $key => $value ) {
-        update_post_meta( $post_id, '_wpi_discount_' . $key, $value );
+    foreach ($meta as $key => $value) {
+        update_post_meta($post_id, '_wpi_discount_' . $key, $value);
     }
 
-    do_action( 'wpinv_post_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_post_update_discount', $meta, $post_id, $post);
 
     return $post_id;
 }
@@ -321,10 +321,10 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_remove_discount( $discount = 0 ) {
+function wpinv_remove_discount($discount = 0) {
 
-    $discount = wpinv_get_discount_obj( $discount );
-    if( ! $discount->exists() ) {
+    $discount = wpinv_get_discount_obj($discount);
+    if (!$discount->exists()) {
         return false;
     }
 
@@ -339,9 +339,9 @@ 
  * @param string $new_status
  * @return bool
  */
-function wpinv_update_discount_status( $discount = 0, $new_status = 'publish' ) {
-    $discount = wpinv_get_discount_obj( $discount );
-    return $discount->update_status( $new_status );
+function wpinv_update_discount_status($discount = 0, $new_status = 'publish') {
+    $discount = wpinv_get_discount_obj($discount);
+    return $discount->update_status($new_status);
 }
 
 /**
@@ -350,48 +350,48 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_exists( $discount ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_discount_exists($discount) {
+    $discount = wpinv_get_discount_obj($discount);
     return $discount->exists();
 }
 
-function wpinv_is_discount_active( $code_id = null, $silent = false ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_active($code_id = null, $silent = false) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        if ( wpinv_is_discount_expired( $code_id, $silent ) ) {
-            if( defined( 'DOING_AJAX' ) && ! $silent ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is expired.', 'invoicing' ) );
+    if ($discount) {
+        if (wpinv_is_discount_expired($code_id, $silent)) {
+            if (defined('DOING_AJAX') && !$silent) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is expired.', 'invoicing'));
             }
-        } elseif ( $discount->post_status == 'publish' ) {
+        } elseif ($discount->post_status == 'publish') {
             $return = true;
         } else {
-            if( defined( 'DOING_AJAX' ) && ! $silent ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active.', 'invoicing' ) );
+            if (defined('DOING_AJAX') && !$silent) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active.', 'invoicing'));
             }
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_active', $return, $code_id );
+    return apply_filters('wpinv_is_discount_active', $return, $code_id);
 }
 
-function wpinv_get_discount_code( $code_id = null ) {
-    $code = get_post_meta( $code_id, '_wpi_discount_code', true );
+function wpinv_get_discount_code($code_id = null) {
+    $code = get_post_meta($code_id, '_wpi_discount_code', true);
 
-    return apply_filters( 'wpinv_get_discount_code', $code, $code_id );
+    return apply_filters('wpinv_get_discount_code', $code, $code_id);
 }
 
-function wpinv_get_discount_start_date( $code_id = null ) {
-    $start_date = get_post_meta( $code_id, '_wpi_discount_start', true );
+function wpinv_get_discount_start_date($code_id = null) {
+    $start_date = get_post_meta($code_id, '_wpi_discount_start', true);
 
-    return apply_filters( 'wpinv_get_discount_start_date', $start_date, $code_id );
+    return apply_filters('wpinv_get_discount_start_date', $start_date, $code_id);
 }
 
-function wpinv_get_discount_expiration( $code_id = null ) {
-    $expiration = get_post_meta( $code_id, '_wpi_discount_expiration', true );
+function wpinv_get_discount_expiration($code_id = null) {
+    $expiration = get_post_meta($code_id, '_wpi_discount_expiration', true);
 
-    return apply_filters( 'wpinv_get_discount_expiration', $expiration, $code_id );
+    return apply_filters('wpinv_get_discount_expiration', $expiration, $code_id);
 }
 
 /**
@@ -400,8 +400,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return int
  */
-function wpinv_get_discount_max_uses( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_max_uses($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (int) $discount->max_uses;
 }
 
@@ -411,8 +411,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return int
  */
-function wpinv_get_discount_uses( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_uses($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (int) $discount->uses;
 }
 
@@ -422,8 +422,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return float
  */
-function wpinv_get_discount_min_total( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_min_total($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (float) $discount->min_total;
 }
 
@@ -433,8 +433,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return float
  */
-function wpinv_get_discount_max_total( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_max_total($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (float) $discount->max_total;
 }
 
@@ -444,8 +444,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return float
  */
-function wpinv_get_discount_amount( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_amount($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return (float) $discount->amount;
 }
 
@@ -456,28 +456,28 @@ 
  * @param bool $name
  * @return string
  */
-function wpinv_get_discount_type( $discount = array(), $name = false ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_type($discount = array(), $name = false) {
+    $discount = wpinv_get_discount_obj($discount);
 
     // Are we returning the name or just the type.
-    if( $name ) {
+    if ($name) {
         return $discount->type_name;
     }
 
     return $discount->type;
 }
 
-function wpinv_discount_status( $status ) {
-    switch( $status ){
+function wpinv_discount_status($status) {
+    switch ($status) {
         case 'expired' :
-            $name = __( 'Expired', 'invoicing' );
+            $name = __('Expired', 'invoicing');
             break;
         case 'publish' :
         case 'active' :
-            $name = __( 'Active', 'invoicing' );
+            $name = __('Active', 'invoicing');
             break;
         default :
-            $name = __( 'Inactive', 'invoicing' );
+            $name = __('Inactive', 'invoicing');
             break;
     }
     return $name;
@@ -489,8 +489,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return array
  */
-function wpinv_get_discount_excluded_items( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_excluded_items($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return $discount->excluded_items;
 }
 
@@ -500,17 +500,17 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return array
  */
-function wpinv_get_discount_item_reqs( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_get_discount_item_reqs($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     return $discount->items;
 }
 
-function wpinv_get_discount_item_condition( $code_id = 0 ) {
-    return get_post_meta( $code_id, '_wpi_discount_item_condition', true );
+function wpinv_get_discount_item_condition($code_id = 0) {
+    return get_post_meta($code_id, '_wpi_discount_item_condition', true);
 }
 
-function wpinv_is_discount_not_global( $code_id = 0 ) {
-    return (bool) get_post_meta( $code_id, '_wpi_discount_is_not_global', true );
+function wpinv_is_discount_not_global($code_id = 0) {
+    return (bool) get_post_meta($code_id, '_wpi_discount_is_not_global', true);
 }
 
 /**
@@ -519,14 +519,14 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_is_discount_expired( $discount = array(), $silent = false ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_is_discount_expired($discount = array(), $silent = false) {
+    $discount = wpinv_get_discount_obj($discount);
 
-    if ( $discount->is_expired() ) {
-        $discount->update_status( 'pending' );
+    if ($discount->is_expired()) {
+        $discount->update_status('pending');
 
-        if( empty( $silent ) ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount has expired.', 'invoicing' ) );
+        if (empty($silent)) {
+            wpinv_set_error('wpinv-discount-error', __('This discount has expired.', 'invoicing'));
         }
         return true;
     }
@@ -540,12 +540,12 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_is_discount_started( $discount = array() ) {
-    $discount = wpinv_get_discount_obj( $discount );
+function wpinv_is_discount_started($discount = array()) {
+    $discount = wpinv_get_discount_obj($discount);
     $started  = $discount->has_started();
 
-    if( empty( $started ) ) {
-        wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active yet.', 'invoicing' ) );
+    if (empty($started)) {
+        wpinv_set_error('wpinv-discount-error', __('This discount is not active yet.', 'invoicing'));
     }
 
     return $started;
@@ -557,10 +557,10 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_check_discount_dates( $discount ) {
-    $discount = wpinv_get_discount_obj( $discount );
-    $return   = wpinv_is_discount_started( $discount ) && ! wpinv_is_discount_expired( $discount );
-    return apply_filters( 'wpinv_check_discount_dates', $return, $discount->ID, $discount, $discount->code );
+function wpinv_check_discount_dates($discount) {
+    $discount = wpinv_get_discount_obj($discount);
+    $return   = wpinv_is_discount_started($discount) && !wpinv_is_discount_expired($discount);
+    return apply_filters('wpinv_check_discount_dates', $return, $discount->ID, $discount, $discount->code);
 }
 
 /**
@@ -569,12 +569,12 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_is_discount_maxed_out( $discount ) {
-    $discount    = wpinv_get_discount_obj( $discount );
+function wpinv_is_discount_maxed_out($discount) {
+    $discount    = wpinv_get_discount_obj($discount);
     $maxed_out   = $discount->has_exceeded_limit();
 
-    if ( $maxed_out ) {
-        wpinv_set_error( 'wpinv-discount-error', __( 'This discount has reached its maximum usage.', 'invoicing' ) );
+    if ($maxed_out) {
+        wpinv_set_error('wpinv-discount-error', __('This discount has reached its maximum usage.', 'invoicing'));
     }
 
     return $maxed_out;
@@ -586,13 +586,13 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_min_met( $discount ) {
-    $discount    = wpinv_get_discount_obj( $discount );
-    $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $discount->ID );
-    $min_met     = $discount->is_minimum_amount_met( $cart_amount );
+function wpinv_discount_is_min_met($discount) {
+    $discount    = wpinv_get_discount_obj($discount);
+    $cart_amount = (float) wpinv_get_cart_discountable_subtotal($discount->ID);
+    $min_met     = $discount->is_minimum_amount_met($cart_amount);
 
-    if ( ! $min_met ) {
-        wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Minimum invoice amount should be %s', 'invoicing' ), wpinv_price( wpinv_format_amount( $discount->min_total ) ) ) );
+    if (!$min_met) {
+        wpinv_set_error('wpinv-discount-error', sprintf(__('Minimum invoice amount should be %s', 'invoicing'), wpinv_price(wpinv_format_amount($discount->min_total))));
     }
 
     return $min_met;
@@ -604,13 +604,13 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_max_met( $discount ) {
-    $discount    = wpinv_get_discount_obj( $discount );
-    $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $discount->ID );
-    $max_met     = $discount->is_maximum_amount_met( $cart_amount );
+function wpinv_discount_is_max_met($discount) {
+    $discount    = wpinv_get_discount_obj($discount);
+    $cart_amount = (float) wpinv_get_cart_discountable_subtotal($discount->ID);
+    $max_met     = $discount->is_maximum_amount_met($cart_amount);
 
-    if ( ! $max_met ) {
-        wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Maximum invoice amount should be %s', 'invoicing' ), wpinv_price( wpinv_format_amount( $discount->max_total ) ) ) );
+    if (!$max_met) {
+        wpinv_set_error('wpinv-discount-error', sprintf(__('Maximum invoice amount should be %s', 'invoicing'), wpinv_price(wpinv_format_amount($discount->max_total))));
     }
 
     return $max_met;
@@ -622,8 +622,8 @@ 
  * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_single_use( $discount ) {
-    $discount    = wpinv_get_discount_obj( $discount );
+function wpinv_discount_is_single_use($discount) {
+    $discount = wpinv_get_discount_obj($discount);
     return $discount->is_single_use;
 }
 
@@ -634,53 +634,53 @@ 
  * @param int|array|string|WPInv_Discount $code discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_recurring( $discount = 0, $code = 0 ) {
+function wpinv_discount_is_recurring($discount = 0, $code = 0) {
 
-    if( ! empty( $discount ) ) {
-        $discount    = wpinv_get_discount_obj( $discount );
+    if (!empty($discount)) {
+        $discount    = wpinv_get_discount_obj($discount);
     } else {
-        $discount    = wpinv_get_discount_obj( $code );
+        $discount    = wpinv_get_discount_obj($code);
     }
 
     return $discount->get_is_recurring();
 }
 
-function wpinv_discount_item_reqs_met( $code_id = null ) {
-    $item_reqs    = wpinv_get_discount_item_reqs( $code_id );
-    $condition    = wpinv_get_discount_item_condition( $code_id );
-    $excluded_ps  = wpinv_get_discount_excluded_items( $code_id );
+function wpinv_discount_item_reqs_met($code_id = null) {
+    $item_reqs    = wpinv_get_discount_item_reqs($code_id);
+    $condition    = wpinv_get_discount_item_condition($code_id);
+    $excluded_ps  = wpinv_get_discount_excluded_items($code_id);
     $cart_items   = wpinv_get_cart_contents();
-    $cart_ids     = $cart_items ? wp_list_pluck( $cart_items, 'id' ) : null;
+    $cart_ids     = $cart_items ? wp_list_pluck($cart_items, 'id') : null;
     $ret          = false;
 
-    if ( empty( $item_reqs ) && empty( $excluded_ps ) ) {
+    if (empty($item_reqs) && empty($excluded_ps)) {
         $ret = true;
     }
 
     // Normalize our data for item requirements, exclusions and cart data
     // First absint the items, then sort, and reset the array keys
-    $item_reqs = array_map( 'absint', $item_reqs );
-    asort( $item_reqs );
-    $item_reqs = array_values( $item_reqs );
+    $item_reqs = array_map('absint', $item_reqs);
+    asort($item_reqs);
+    $item_reqs = array_values($item_reqs);
 
-    $excluded_ps  = array_map( 'absint', $excluded_ps );
-    asort( $excluded_ps );
-    $excluded_ps  = array_values( $excluded_ps );
+    $excluded_ps  = array_map('absint', $excluded_ps);
+    asort($excluded_ps);
+    $excluded_ps  = array_values($excluded_ps);
 
-    $cart_ids     = array_map( 'absint', $cart_ids );
-    asort( $cart_ids );
-    $cart_ids     = array_values( $cart_ids );
+    $cart_ids     = array_map('absint', $cart_ids);
+    asort($cart_ids);
+    $cart_ids     = array_values($cart_ids);
 
     // Ensure we have requirements before proceeding
-    if ( !$ret && ! empty( $item_reqs ) ) {
-        switch( $condition ) {
+    if (!$ret && !empty($item_reqs)) {
+        switch ($condition) {
             case 'all' :
                 // Default back to true
                 $ret = true;
 
-                foreach ( $item_reqs as $item_id ) {
-                    if ( !wpinv_item_in_cart( $item_id ) ) {
-                        wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                foreach ($item_reqs as $item_id) {
+                    if (!wpinv_item_in_cart($item_id)) {
+                        wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                         $ret = false;
                         break;
                     }
@@ -689,15 +689,15 @@ 
                 break;
 
             default : // Any
-                foreach ( $item_reqs as $item_id ) {
-                    if ( wpinv_item_in_cart( $item_id ) ) {
+                foreach ($item_reqs as $item_id) {
+                    if (wpinv_item_in_cart($item_id)) {
                         $ret = true;
                         break;
                     }
                 }
 
-                if( ! $ret ) {
-                    wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                if (!$ret) {
+                    wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                 }
 
                 break;
@@ -706,15 +706,15 @@ 
         $ret = true;
     }
 
-    if( ! empty( $excluded_ps ) ) {
+    if (!empty($excluded_ps)) {
         // Check that there are items other than excluded ones in the cart
-        if( $cart_ids == $excluded_ps ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not valid for the cart contents.', 'invoicing' ) );
+        if ($cart_ids == $excluded_ps) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is not valid for the cart contents.', 'invoicing'));
             $ret = false;
         }
     }
 
-    return (bool) apply_filters( 'wpinv_is_discount_item_req_met', $ret, $code_id, $condition );
+    return (bool) apply_filters('wpinv_is_discount_item_req_met', $ret, $code_id, $condition);
 }
 
 /**
@@ -725,59 +725,59 @@ 
  * @param int|array|string|WPInv_Discount $code_id discount data, object, ID or code.
  * @return bool
  */
-function wpinv_is_discount_used( $discount = array(), $user = '', $code_id = array() ) {
+function wpinv_is_discount_used($discount = array(), $user = '', $code_id = array()) {
 
-    if( ! empty( $discount ) ) {
-        $discount = wpinv_get_discount_obj( $discount );
+    if (!empty($discount)) {
+        $discount = wpinv_get_discount_obj($discount);
     } else {
-        $discount = wpinv_get_discount_obj( $code_id );
+        $discount = wpinv_get_discount_obj($code_id);
     }
 
-    $is_used = ! $discount->is_valid_for_user( $user );
-    $is_used = apply_filters( 'wpinv_is_discount_used', $is_used, $discount->code, $user, $discount->ID, $discount );
+    $is_used = !$discount->is_valid_for_user($user);
+    $is_used = apply_filters('wpinv_is_discount_used', $is_used, $discount->code, $user, $discount->ID, $discount);
 
-    if( $is_used ) {
-        wpinv_set_error( 'wpinv-discount-error', __( 'This discount has already been redeemed.', 'invoicing' ) );
+    if ($is_used) {
+        wpinv_set_error('wpinv-discount-error', __('This discount has already been redeemed.', 'invoicing'));
     }
 
     return $is_used;
 }
 
-function wpinv_is_discount_valid( $code = '', $user = '', $set_error = true ) {
+function wpinv_is_discount_valid($code = '', $user = '', $set_error = true) {
 
     // Abort early if there is no discount code.
-    if ( empty( $code ) ) {
+    if (empty($code)) {
         return false;
     }
 
     $return      = false;
-    $discount_id = wpinv_get_discount_id_by_code( $code );
-    $user        = trim( $user );
+    $discount_id = wpinv_get_discount_id_by_code($code);
+    $user        = trim($user);
 
-    if ( wpinv_get_cart_contents() ) {
-        if ( $discount_id !== false ) {
+    if (wpinv_get_cart_contents()) {
+        if ($discount_id !== false) {
             if (
-                wpinv_is_discount_active( $discount_id ) &&
-                wpinv_check_discount_dates( $discount_id ) &&
-                !wpinv_is_discount_maxed_out( $discount_id ) &&
-                !wpinv_is_discount_used( $code, $user, $discount_id ) &&
-                wpinv_discount_is_min_met( $discount_id ) &&
-                wpinv_discount_is_max_met( $discount_id ) &&
-                wpinv_discount_item_reqs_met( $discount_id )
+                wpinv_is_discount_active($discount_id) &&
+                wpinv_check_discount_dates($discount_id) &&
+                !wpinv_is_discount_maxed_out($discount_id) &&
+                !wpinv_is_discount_used($code, $user, $discount_id) &&
+                wpinv_discount_is_min_met($discount_id) &&
+                wpinv_discount_is_max_met($discount_id) &&
+                wpinv_discount_item_reqs_met($discount_id)
             ) {
                 $return = true;
             }
-        } elseif( $set_error ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is invalid.', 'invoicing' ) );
+        } elseif ($set_error) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is invalid.', 'invoicing'));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_valid', $return, $discount_id, $code, $user );
+    return apply_filters('wpinv_is_discount_valid', $return, $discount_id, $code, $user);
 }
 
-function wpinv_get_discount_id_by_code( $code ) {
-    $discount = wpinv_get_discount_by_code( $code );
-    if( $discount ) {
+function wpinv_get_discount_id_by_code($code) {
+    $discount = wpinv_get_discount_by_code($code);
+    if ($discount) {
         return $discount->ID;
     }
     return false;
@@ -790,9 +790,9 @@ 
  * @param float $base_price The number of usages to increase by
  * @return float
  */
-function wpinv_get_discounted_amount( $discount, $base_price ) {
-    $discount = wpinv_get_discount_obj( $discount );
-    return $discount->get_discounted_amount( $base_price );
+function wpinv_get_discounted_amount($discount, $base_price) {
+    $discount = wpinv_get_discount_obj($discount);
+    return $discount->get_discounted_amount($base_price);
 }
 
 /**
@@ -802,9 +802,9 @@ 
  * @param int $by The number of usages to increase by.
  * @return int the new number of uses.
  */
-function wpinv_increase_discount_usage( $discount, $by = 1 ) {
-    $discount   = wpinv_get_discount_obj( $discount );
-    return $discount->increase_usage( $by );
+function wpinv_increase_discount_usage($discount, $by = 1) {
+    $discount = wpinv_get_discount_obj($discount);
+    return $discount->increase_usage($by);
 }
 
 /**
@@ -814,72 +814,72 @@ 
  * @param int $by The number of usages to decrease by.
  * @return int the new number of uses.
  */
-function wpinv_decrease_discount_usage( $discount, $by = 1 ) {
-    $discount   = wpinv_get_discount_obj( $discount );
-    return $discount->increase_usage( 0 - $by );
+function wpinv_decrease_discount_usage($discount, $by = 1) {
+    $discount = wpinv_get_discount_obj($discount);
+    return $discount->increase_usage(0 - $by);
 }
 
-function wpinv_format_discount_rate( $type, $amount ) {
-    if ( $type == 'flat' ) {
-        $rate = wpinv_price( wpinv_format_amount( $amount ) );
+function wpinv_format_discount_rate($type, $amount) {
+    if ($type == 'flat') {
+        $rate = wpinv_price(wpinv_format_amount($amount));
     } else {
         $rate = $amount . '%';
     }
 
-    return apply_filters( 'wpinv_format_discount_rate', $rate, $type, $amount );
+    return apply_filters('wpinv_format_discount_rate', $rate, $type, $amount);
 }
 
-function wpinv_set_cart_discount( $code = '' ) {
-    if ( wpinv_multiple_discounts_allowed() ) {
+function wpinv_set_cart_discount($code = '') {
+    if (wpinv_multiple_discounts_allowed()) {
         // Get all active cart discounts
         $discounts = wpinv_get_cart_discounts();
     } else {
         $discounts = false; // Only one discount allowed per purchase, so override any existing
     }
 
-    if ( $discounts ) {
-        $key = array_search( strtolower( $code ), array_map( 'strtolower', $discounts ) );
-        if( false !== $key ) {
-            unset( $discounts[ $key ] ); // Can't set the same discount more than once
+    if ($discounts) {
+        $key = array_search(strtolower($code), array_map('strtolower', $discounts));
+        if (false !== $key) {
+            unset($discounts[$key]); // Can't set the same discount more than once
         }
         $discounts[] = $code;
     } else {
         $discounts = array();
         $discounts[] = $code;
     }
-    $discounts = array_values( $discounts );
+    $discounts = array_values($discounts);
 
     $data = wpinv_get_checkout_session();
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         $data = array();
     } else {
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'] ) ) {
-            $payment_meta['user_info']['discount']  = implode( ',', $discounts );
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'])) {
+            $payment_meta['user_info']['discount'] = implode(',', $discounts);
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
     }
     $data['cart_discounts'] = $discounts;
 
-    wpinv_set_checkout_session( $data );
+    wpinv_set_checkout_session($data);
 
     return $discounts;
 }
 
-function wpinv_unset_cart_discount( $code = '' ) {
+function wpinv_unset_cart_discount($code = '') {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( $code && !empty( $discounts ) && in_array( $code, $discounts ) ) {
-        $key = array_search( $code, $discounts );
-        unset( $discounts[ $key ] );
+    if ($code && !empty($discounts) && in_array($code, $discounts)) {
+        $key = array_search($code, $discounts);
+        unset($discounts[$key]);
 
         $data = wpinv_get_checkout_session();
         $data['cart_discounts'] = $discounts;
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'] ) ) {
-            $payment_meta['user_info']['discount']  = !empty( $discounts ) ? implode( ',', $discounts ) : '';
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'])) {
+            $payment_meta['user_info']['discount'] = !empty($discounts) ? implode(',', $discounts) : '';
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
 
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
     }
 
     return $discounts;
@@ -888,10 +888,10 @@ 
 function wpinv_unset_all_cart_discounts() {
     $data = wpinv_get_checkout_session();
 
-    if ( !empty( $data ) && isset( $data['cart_discounts'] ) ) {
-        unset( $data['cart_discounts'] );
+    if (!empty($data) && isset($data['cart_discounts'])) {
+        unset($data['cart_discounts']);
 
-         wpinv_set_checkout_session( $data );
+         wpinv_set_checkout_session($data);
          return true;
     }
 
@@ -900,13 +900,13 @@ 
 
 function wpinv_get_cart_discounts() {
     $session = wpinv_get_checkout_session();
-    return empty( $session['cart_discounts'] ) ? false : $session['cart_discounts'];
+    return empty($session['cart_discounts']) ? false : $session['cart_discounts'];
 }
 
-function wpinv_cart_has_discounts( $items = array() ) {
+function wpinv_cart_has_discounts($items = array()) {
     $ret = false;
 
-    if ( wpinv_get_cart_discounts( $items ) ) {
+    if (wpinv_get_cart_discounts($items)) {
         $ret = true;
     }
 
@@ -917,131 +917,131 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_cart_has_discounts', $ret );
+    return apply_filters('wpinv_cart_has_discounts', $ret);
 }
 
-function wpinv_get_cart_discounted_amount( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounted_amount($items = array(), $discounts = false) {
     $amount = 0.00;
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items  = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( $items ) {
-        $discounts = wp_list_pluck( $items, 'discount' );
+    if ($items) {
+        $discounts = wp_list_pluck($items, 'discount');
 
-        if ( is_array( $discounts ) ) {
-            $discounts = array_map( 'floatval', $discounts );
-            $amount    = array_sum( $discounts );
+        if (is_array($discounts)) {
+            $discounts = array_map('floatval', $discounts);
+            $amount    = array_sum($discounts);
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_discounted_amount', $amount );
+    return apply_filters('wpinv_get_cart_discounted_amount', $amount);
 }
 
-function wpinv_get_cart_items_discount_amount( $items = array(), $discount = false ) {
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+function wpinv_get_cart_items_discount_amount($items = array(), $discount = false) {
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( empty( $discount ) || empty( $items ) ) {
+    if (empty($discount) || empty($items)) {
         return 0;
     }
 
     $amount = 0;
 
-    foreach ( $items as $item ) {
-        $amount += wpinv_get_cart_item_discount_amount( $item, $discount );
+    foreach ($items as $item) {
+        $amount += wpinv_get_cart_item_discount_amount($item, $discount);
     }
 
-    $amount = wpinv_round_amount( $amount );
+    $amount = wpinv_round_amount($amount);
 
     return $amount;
 }
 
-function wpinv_get_cart_item_discount_amount( $item = array(), $discount = false ) {
+function wpinv_get_cart_item_discount_amount($item = array(), $discount = false) {
     global $wpinv_is_last_cart_item, $wpinv_flat_discount_total;
 
     $amount = 0;
 
-    if ( empty( $item ) || empty( $item['id'] ) ) {
+    if (empty($item) || empty($item['id'])) {
         return $amount;
     }
 
-    if ( empty( $item['quantity'] ) ) {
+    if (empty($item['quantity'])) {
         return $amount;
     }
 
-    if ( empty( $item['options'] ) ) {
+    if (empty($item['options'])) {
         $item['options'] = array();
     }
 
-    $price            = wpinv_get_cart_item_price( $item['id'], $item, $item['options'] );
+    $price            = wpinv_get_cart_item_price($item['id'], $item, $item['options']);
     $discounted_price = $price;
 
     $discounts = false === $discount ? wpinv_get_cart_discounts() : $discount;
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return $amount;
     }
 
-    if ( $discounts ) {
-        if ( is_array( $discounts ) ) {
-            $discounts = array_values( $discounts );
+    if ($discounts) {
+        if (is_array($discounts)) {
+            $discounts = array_values($discounts);
         } else {
-            $discounts = explode( ',', $discounts );
+            $discounts = explode(',', $discounts);
         }
     }
 
-    if( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $code_id = wpinv_get_discount_id_by_code( $discount );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $code_id = wpinv_get_discount_id_by_code($discount);
 
             // Check discount exists
-            if( $code_id === false ) {
+            if ($code_id === false) {
                 continue;
             }
 
-            $reqs           = wpinv_get_discount_item_reqs( $code_id );
-            $excluded_items = wpinv_get_discount_excluded_items( $code_id );
+            $reqs           = wpinv_get_discount_item_reqs($code_id);
+            $excluded_items = wpinv_get_discount_excluded_items($code_id);
 
             // Make sure requirements are set and that this discount shouldn't apply to the whole cart
-            if ( !empty( $reqs ) && wpinv_is_discount_not_global( $code_id ) ) {
-                foreach ( $reqs as $item_id ) {
-                    if ( $item_id == $item['id'] && ! in_array( $item['id'], $excluded_items ) ) {
-                        $discounted_price -= wpinv_get_discounted_amount( $discount, $price );
+            if (!empty($reqs) && wpinv_is_discount_not_global($code_id)) {
+                foreach ($reqs as $item_id) {
+                    if ($item_id == $item['id'] && !in_array($item['id'], $excluded_items)) {
+                        $discounted_price -= wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             } else {
                 // This is a global cart discount
-                if ( !in_array( $item['id'], $excluded_items ) ) {
-                    if ( 'flat' === wpinv_get_discount_type( $code_id ) ) {
+                if (!in_array($item['id'], $excluded_items)) {
+                    if ('flat' === wpinv_get_discount_type($code_id)) {
                         $items_subtotal    = 0.00;
                         $cart_items        = wpinv_get_cart_contents();
 
-                        foreach ( $cart_items as $cart_item ) {
-                            if ( ! in_array( $cart_item['id'], $excluded_items ) ) {
-                                $options = !empty( $cart_item['options'] ) ? $cart_item['options'] : array();
-                                $item_price      = wpinv_get_cart_item_price( $cart_item['id'], $cart_item, $options );
+                        foreach ($cart_items as $cart_item) {
+                            if (!in_array($cart_item['id'], $excluded_items)) {
+                                $options = !empty($cart_item['options']) ? $cart_item['options'] : array();
+                                $item_price      = wpinv_get_cart_item_price($cart_item['id'], $cart_item, $options);
                                 $items_subtotal += $item_price * $cart_item['quantity'];
                             }
                         }
 
-                        $subtotal_percent  = ( ( $price * $item['quantity'] ) / $items_subtotal );
-                        $code_amount       = wpinv_get_discount_amount( $code_id );
+                        $subtotal_percent  = (($price * $item['quantity']) / $items_subtotal);
+                        $code_amount       = wpinv_get_discount_amount($code_id);
                         $discounted_amount = $code_amount * $subtotal_percent;
                         $discounted_price -= $discounted_amount;
 
-                        $wpinv_flat_discount_total += round( $discounted_amount, wpinv_currency_decimal_filter() );
+                        $wpinv_flat_discount_total += round($discounted_amount, wpinv_currency_decimal_filter());
 
-                        if ( $wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount ) {
+                        if ($wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount) {
                             $adjustment = $code_amount - $wpinv_flat_discount_total;
                             $discounted_price -= $adjustment;
                         }
                     } else {
-                        $discounted_price -= wpinv_get_discounted_amount( $discount, $price );
+                        $discounted_price -= wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             }
         }
 
-        $amount = ( $price - apply_filters( 'wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price ) );
+        $amount = ($price - apply_filters('wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price));
 
-        if ( 'flat' !== wpinv_get_discount_type( $code_id ) ) {
+        if ('flat' !== wpinv_get_discount_type($code_id)) {
             $amount = $amount * $item['quantity'];
         }
     }
@@ -1049,59 +1049,59 @@ 
     return $amount;
 }
 
-function wpinv_cart_discounts_html( $items = array() ) {
-    echo wpinv_get_cart_discounts_html( $items );
+function wpinv_cart_discounts_html($items = array()) {
+    echo wpinv_get_cart_discounts_html($items);
 }
 
-function wpinv_get_cart_discounts_html( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounts_html($items = array(), $discounts = false) {
     global $wpi_cart_columns;
 
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( !$discounts ) {
-        $discounts = wpinv_get_cart_discounts( $items );
+    if (!$discounts) {
+        $discounts = wpinv_get_cart_discounts($items);
     }
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
 
-    $discounts = is_array( $discounts ) ? $discounts : array( $discounts );
+    $discounts = is_array($discounts) ? $discounts : array($discounts);
 
     $html = '';
 
-    foreach ( $discounts as $discount ) {
-        $discount_id    = wpinv_get_discount_id_by_code( $discount );
-        $discount_value = wpinv_get_discount_amount( $discount_id );
-        $rate           = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), $discount_value );
-        $amount         = wpinv_get_cart_items_discount_amount( $items, $discount );
-        $remove_btn     = '<a title="' . esc_attr__( 'Remove discount', 'invoicing' ) . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
+    foreach ($discounts as $discount) {
+        $discount_id    = wpinv_get_discount_id_by_code($discount);
+        $discount_value = wpinv_get_discount_amount($discount_id);
+        $rate           = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), $discount_value);
+        $amount         = wpinv_get_cart_items_discount_amount($items, $discount);
+        $remove_btn     = '<a title="' . esc_attr__('Remove discount', 'invoicing') . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
 
         $html .= '<tr class="wpinv_cart_footer_row wpinv_cart_discount_row">';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_first', $items );
+        do_action('wpinv_checkout_table_discount_first', $items);
         $html .= ob_get_clean();
-        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label( $discount, $rate, false ) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price( wpinv_format_amount( $amount ) ) . '</span></td>';
+        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label($discount, $rate, false) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price(wpinv_format_amount($amount)) . '</span></td>';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_last', $items );
+        do_action('wpinv_checkout_table_discount_last', $items);
         $html .= ob_get_clean();
         $html .= '</tr>';
     }
 
-    return apply_filters( 'wpinv_get_cart_discounts_html', $html, $discounts, $rate );
+    return apply_filters('wpinv_get_cart_discounts_html', $html, $discounts, $rate);
 }
 
-function wpinv_display_cart_discount( /** @scrutinizer ignore-unused */ $formatted = false, $echo = false ) {
+function wpinv_display_cart_discount(/** @scrutinizer ignore-unused */ $formatted = false, $echo = false) {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return false;
     }
 
-    $discount_id  = wpinv_get_discount_id_by_code( $discounts[0] );
-    $amount       = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), wpinv_get_discount_amount( $discount_id ) );
+    $discount_id  = wpinv_get_discount_id_by_code($discounts[0]);
+    $amount       = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), wpinv_get_discount_amount($discount_id));
 
-    if ( $echo ) {
+    if ($echo) {
         echo $amount;
     }
 
@@ -1109,65 +1109,65 @@ 
 }
 
 function wpinv_remove_cart_discount() {
-    if ( !isset( $_GET['discount_id'] ) || ! isset( $_GET['discount_code'] ) ) {
+    if (!isset($_GET['discount_id']) || !isset($_GET['discount_code'])) {
         return;
     }
 
-    do_action( 'wpinv_pre_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_pre_remove_cart_discount', absint($_GET['discount_id']));
 
-    wpinv_unset_cart_discount( urldecode( $_GET['discount_code'] ) );
+    wpinv_unset_cart_discount(urldecode($_GET['discount_code']));
 
-    do_action( 'wpinv_post_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_post_remove_cart_discount', absint($_GET['discount_id']));
 
-    wp_redirect( wpinv_get_checkout_uri() ); wpinv_die();
+    wp_redirect(wpinv_get_checkout_uri()); wpinv_die();
 }
-add_action( 'wpinv_remove_cart_discount', 'wpinv_remove_cart_discount' );
+add_action('wpinv_remove_cart_discount', 'wpinv_remove_cart_discount');
 
 function wpinv_maybe_remove_cart_discount() {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
 
-    $discounts = array_filter( $discounts );
-    foreach ( $discounts as $discount ) {
-        if ( !wpinv_is_discount_valid( $discount ) ) {
-            wpinv_unset_cart_discount( $discount );
+    $discounts = array_filter($discounts);
+    foreach ($discounts as $discount) {
+        if (!wpinv_is_discount_valid($discount)) {
+            wpinv_unset_cart_discount($discount);
         }
     }
 }
-add_action( 'wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount' );
+add_action('wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount');
 
 function wpinv_multiple_discounts_allowed() {
-    $ret = wpinv_get_option( 'allow_multiple_discounts', false );
-    return (bool) apply_filters( 'wpinv_multiple_discounts_allowed', $ret );
+    $ret = wpinv_get_option('allow_multiple_discounts', false);
+    return (bool) apply_filters('wpinv_multiple_discounts_allowed', $ret);
 }
 
-function wpinv_get_discount_label( $code, $echo = true ) {
-    $label = wp_sprintf( __( 'Discount%1$s', 'invoicing' ), ( $code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)': '' ) );
-    $label = apply_filters( 'wpinv_get_discount_label', $label, $code );
+function wpinv_get_discount_label($code, $echo = true) {
+    $label = wp_sprintf(__('Discount%1$s', 'invoicing'), ($code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)' : ''));
+    $label = apply_filters('wpinv_get_discount_label', $label, $code);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_cart_discount_label( $code, $rate, $echo = true ) {
-    $label = wp_sprintf( __( 'Discount: %s', 'invoicing' ), $code );
-    $label = apply_filters( 'wpinv_cart_discount_label', $label, $code, $rate );
+function wpinv_cart_discount_label($code, $rate, $echo = true) {
+    $label = wp_sprintf(__('Discount: %s', 'invoicing'), $code);
+    $label = apply_filters('wpinv_cart_discount_label', $label, $code, $rate);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_check_delete_discount( $check, $post ) {
-    if ( $post->post_type == 'wpi_discount' && wpinv_get_discount_uses( $post->ID ) > 0 ) {
+function wpinv_check_delete_discount($check, $post) {
+    if ($post->post_type == 'wpi_discount' && wpinv_get_discount_uses($post->ID) > 0) {
         return true;
     }
 
@@ -1178,33 +1178,33 @@ 
     global $wpi_checkout_id;
 
     $discounts = wpinv_get_cart_discounts();
-    $discounts = array_filter( $discounts );
+    $discounts = array_filter($discounts);
 
-    if ( !empty( $discounts ) ) {
+    if (!empty($discounts)) {
         $invalid = false;
 
-        foreach ( $discounts as $key => $code ) {
-            if ( !wpinv_is_discount_valid( $code, (int)wpinv_get_user_id( $wpi_checkout_id ) ) ) {
+        foreach ($discounts as $key => $code) {
+            if (!wpinv_is_discount_valid($code, (int) wpinv_get_user_id($wpi_checkout_id))) {
                 $invalid = true;
 
-                wpinv_unset_cart_discount( $code );
+                wpinv_unset_cart_discount($code);
             }
         }
 
-        if ( $invalid ) {
+        if ($invalid) {
             $errors = wpinv_get_errors();
-            $error  = !empty( $errors['wpinv-discount-error'] ) ? $errors['wpinv-discount-error'] . ' ' : '';
-            $error  .= __( 'The discount has been removed from cart.', 'invoicing' );
-            wpinv_set_error( 'wpinv-discount-error', $error );
+            $error  = !empty($errors['wpinv-discount-error']) ? $errors['wpinv-discount-error'] . ' ' : '';
+            $error .= __('The discount has been removed from cart.', 'invoicing');
+            wpinv_set_error('wpinv-discount-error', $error);
 
-            wpinv_recalculate_tax( true );
+            wpinv_recalculate_tax(true);
         }
     }
 }
-add_action( 'wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10 );
+add_action('wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10);
 
 function wpinv_discount_amount() {
     $output = 0.00;
 
-    return apply_filters( 'wpinv_discount_amount', $output );
+    return apply_filters('wpinv_discount_amount', $output);
 }
\ No newline at end of file

includes/wpinv-tax-functions.php

Braces +9 added lines, -6 removed lines

@@ -70,8 +70,9 @@ 
         if( !empty( $tax_rates ) ) {
             // Locate the tax rate for this country / state, if it exists
             foreach( $tax_rates as $key => $tax_rate ) {
-                if( $country != $tax_rate['country'] )
-                    continue;
+                if( $country != $tax_rate['country'] ) {
+                                    continue;
+                }
 
                 if( !empty( $tax_rate['global'] ) ) {
                     if( !empty( $tax_rate['rate'] ) ) {
@@ -79,8 +80,9 @@ 
                     }
                 } else {
 
-                    if( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) )
-                        continue;
+                    if( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) ) {
+                                            continue;
+                    }
 
                     $state_rate = $tax_rate['rate'];
                     if( 0 !== $state_rate || !empty( $state_rate ) ) {
@@ -183,8 +185,9 @@ 
 }
 
 function wpinv_cart_needs_tax_address_fields() {
-    if( !wpinv_is_cart_taxed() )
-        return false;
+    if( !wpinv_is_cart_taxed() ) {
+            return false;
+    }
 
     return ! did_action( 'wpinv_after_cc_fields', 'wpinv_default_cc_address_fields' );
 }

Spacing +172 added lines, -172 removed lines

@@ -1,121 +1,121 @@ 
 <?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_use_taxes() {
-    $ret = wpinv_get_option( 'enable_taxes', false );
+    $ret = wpinv_get_option('enable_taxes', false);
     
-    return (bool) apply_filters( 'wpinv_use_taxes', $ret );
+    return (bool) apply_filters('wpinv_use_taxes', $ret);
 }
 
 function wpinv_get_tax_rates() {
-    $rates = get_option( 'wpinv_tax_rates', array() );
+    $rates = get_option('wpinv_tax_rates', array());
     
-    return apply_filters( 'wpinv_get_tax_rates', $rates );
+    return apply_filters('wpinv_get_tax_rates', $rates);
 }
 
-function wpinv_get_tax_rate( $country = false, $state = false, $item_id = 0 ) {
+function wpinv_get_tax_rate($country = false, $state = false, $item_id = 0) {
     global $wpinv_euvat, $wpi_tax_rates, $wpi_userID;
-    $wpi_tax_rates = !empty( $wpi_tax_rates ) ? $wpi_tax_rates : array();
+    $wpi_tax_rates = !empty($wpi_tax_rates) ? $wpi_tax_rates : array();
     
-    if ( !empty( $wpi_tax_rates ) && !empty( $item_id ) && isset( $wpi_tax_rates[$item_id] ) ) {
+    if (!empty($wpi_tax_rates) && !empty($item_id) && isset($wpi_tax_rates[$item_id])) {
         return $wpi_tax_rates[$item_id];
     }
     
-    if ( !$wpinv_euvat->item_is_taxable( $item_id, $country, $state ) ) {
+    if (!$wpinv_euvat->item_is_taxable($item_id, $country, $state)) {
         $wpi_tax_rates[$item_id] = 0;
         return 0;
     }
 
     $is_global = false;
-    if ( $item_id == 'global' ) {
+    if ($item_id == 'global') {
         $is_global = true;
         $item_id = 0;
     }
     
-    $rate           = (float)wpinv_get_option( 'tax_rate', 0 );
-    $user_address   = wpinv_get_user_address( $wpi_userID );
+    $rate           = (float) wpinv_get_option('tax_rate', 0);
+    $user_address   = wpinv_get_user_address($wpi_userID);
     
-    if( empty( $country ) ) {
-        if( !empty( $_POST['wpinv_country'] ) ) {
+    if (empty($country)) {
+        if (!empty($_POST['wpinv_country'])) {
             $country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['wpinv_country'] ) ) {
+        } elseif (!empty($_POST['wpinv_country'])) {
             $country = $_POST['wpinv_country'];
-        } elseif( !empty( $_POST['country'] ) ) {
+        } elseif (!empty($_POST['country'])) {
             $country = $_POST['country'];
-        } elseif( is_user_logged_in() && !empty( $user_address ) ) {
+        } elseif (is_user_logged_in() && !empty($user_address)) {
             $country = $user_address['country'];
         }
-        $country = !empty( $country ) ? $country : wpinv_get_default_country();
+        $country = !empty($country) ? $country : wpinv_get_default_country();
     }
 
-    if( empty( $state ) ) {
-        if( !empty( $_POST['wpinv_state'] ) ) {
+    if (empty($state)) {
+        if (!empty($_POST['wpinv_state'])) {
             $state = $_POST['wpinv_state'];
-        } elseif( !empty( $_POST['wpinv_state'] ) ) {
+        } elseif (!empty($_POST['wpinv_state'])) {
             $state = $_POST['wpinv_state'];
-        } elseif( !empty( $_POST['state'] ) ) {
+        } elseif (!empty($_POST['state'])) {
             $state = $_POST['state'];
-        } elseif( is_user_logged_in() && !empty( $user_address ) ) {
+        } elseif (is_user_logged_in() && !empty($user_address)) {
             $state = $user_address['state'];
         }
-        $state = !empty( $state ) ? $state : wpinv_get_default_state();
+        $state = !empty($state) ? $state : wpinv_get_default_state();
     }
     
-    if( !empty( $country ) ) {
-        $tax_rates   = wpinv_get_tax_rates();
+    if (!empty($country)) {
+        $tax_rates = wpinv_get_tax_rates();
 
-        if( !empty( $tax_rates ) ) {
+        if (!empty($tax_rates)) {
             // Locate the tax rate for this country / state, if it exists
-            foreach( $tax_rates as $key => $tax_rate ) {
-                if( $country != $tax_rate['country'] )
+            foreach ($tax_rates as $key => $tax_rate) {
+                if ($country != $tax_rate['country'])
                     continue;
 
-                if( !empty( $tax_rate['global'] ) ) {
-                    if( !empty( $tax_rate['rate'] ) ) {
-                        $rate = number_format( $tax_rate['rate'], 4 );
+                if (!empty($tax_rate['global'])) {
+                    if (!empty($tax_rate['rate'])) {
+                        $rate = number_format($tax_rate['rate'], 4);
                     }
                 } else {
 
-                    if( empty( $tax_rate['state'] ) || strtolower( $state ) != strtolower( $tax_rate['state'] ) )
+                    if (empty($tax_rate['state']) || strtolower($state) != strtolower($tax_rate['state']))
                         continue;
 
                     $state_rate = $tax_rate['rate'];
-                    if( 0 !== $state_rate || !empty( $state_rate ) ) {
-                        $rate = number_format( $state_rate, 4 );
+                    if (0 !== $state_rate || !empty($state_rate)) {
+                        $rate = number_format($state_rate, 4);
                     }
                 }
             }
         }
     }
     
-    $rate = apply_filters( 'wpinv_tax_rate', $rate, $country, $state, $item_id );
+    $rate = apply_filters('wpinv_tax_rate', $rate, $country, $state, $item_id);
     
-    if ( !empty( $item_id ) ) {
+    if (!empty($item_id)) {
         $wpi_tax_rates[$item_id] = $rate;
-    } else if ( $is_global ) {
+    } else if ($is_global) {
         $wpi_tax_rates['global'] = $rate;
     }
     
     return $rate;
 }
 
-function wpinv_get_formatted_tax_rate( $country = false, $state = false, $item_id ) {
-    $rate = wpinv_get_tax_rate( $country, $state, $item_id );
-    $rate = round( $rate, 4 );
+function wpinv_get_formatted_tax_rate($country = false, $state = false, $item_id) {
+    $rate = wpinv_get_tax_rate($country, $state, $item_id);
+    $rate = round($rate, 4);
     $formatted = $rate .= '%';
-    return apply_filters( 'wpinv_formatted_tax_rate', $formatted, $rate, $country, $state, $item_id );
+    return apply_filters('wpinv_formatted_tax_rate', $formatted, $rate, $country, $state, $item_id);
 }
 
-function wpinv_calculate_tax( $amount = 0, $country = false, $state = false, $item_id = 0 ) {
-    $rate = wpinv_get_tax_rate( $country, $state, $item_id );
+function wpinv_calculate_tax($amount = 0, $country = false, $state = false, $item_id = 0) {
+    $rate = wpinv_get_tax_rate($country, $state, $item_id);
     $tax  = 0.00;
 
-    if ( wpinv_use_taxes() ) {        
-        if ( wpinv_prices_include_tax() ) {
-            $pre_tax = ( $amount / ( ( 1 + $rate ) * 0.01 ) );
+    if (wpinv_use_taxes()) {        
+        if (wpinv_prices_include_tax()) {
+            $pre_tax = ($amount / ((1 + $rate) * 0.01));
             $tax     = $amount - $pre_tax;
         } else {
             $tax = $amount * $rate * 0.01;
@@ -123,46 +123,46 @@ 
 
     }
 
-    return apply_filters( 'wpinv_taxed_amount', $tax, $rate, $country, $state, $item_id );
+    return apply_filters('wpinv_taxed_amount', $tax, $rate, $country, $state, $item_id);
 }
 
 function wpinv_prices_include_tax() {
     return false; // TODO
-    $ret = ( wpinv_get_option( 'prices_include_tax', false ) == 'yes' && wpinv_use_taxes() );
+    $ret = (wpinv_get_option('prices_include_tax', false) == 'yes' && wpinv_use_taxes());
 
-    return apply_filters( 'wpinv_prices_include_tax', $ret );
+    return apply_filters('wpinv_prices_include_tax', $ret);
 }
 
-function wpinv_sales_tax_for_year( $year = null ) {
-    return wpinv_price( wpinv_format_amount( wpinv_get_sales_tax_for_year( $year ) ) );
+function wpinv_sales_tax_for_year($year = null) {
+    return wpinv_price(wpinv_format_amount(wpinv_get_sales_tax_for_year($year)));
 }
 
-function wpinv_get_sales_tax_for_year( $year = null ) {
+function wpinv_get_sales_tax_for_year($year = null) {
     global $wpdb;
 
     // Start at zero
     $tax = 0;
 
-    if ( ! empty( $year ) ) {
+    if (!empty($year)) {
         $args = array(
             'post_type'      => 'wpi_invoice',
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'posts_per_page' => -1,
             'year'           => $year,
             'fields'         => 'ids'
         );
 
-        $payments    = get_posts( $args );
-        $payment_ids = implode( ',', $payments );
+        $payments    = get_posts($args);
+        $payment_ids = implode(',', $payments);
 
-        if ( count( $payments ) > 0 ) {
+        if (count($payments) > 0) {
             $sql = "SELECT SUM( meta_value ) FROM $wpdb->postmeta WHERE meta_key = '_wpinv_tax' AND post_id IN( $payment_ids )";
-            $tax = $wpdb->get_var( $sql );
+            $tax = $wpdb->get_var($sql);
         }
 
     }
 
-    return apply_filters( 'wpinv_get_sales_tax_for_year', $tax, $year );
+    return apply_filters('wpinv_get_sales_tax_for_year', $tax, $year);
 }
 
 function wpinv_is_cart_taxed() {
@@ -171,33 +171,33 @@ 
 
 function wpinv_prices_show_tax_on_checkout() {
     return false; // TODO
-    $ret = ( wpinv_get_option( 'checkout_include_tax', false ) == 'yes' && wpinv_use_taxes() );
+    $ret = (wpinv_get_option('checkout_include_tax', false) == 'yes' && wpinv_use_taxes());
 
-    return apply_filters( 'wpinv_taxes_on_prices_on_checkout', $ret );
+    return apply_filters('wpinv_taxes_on_prices_on_checkout', $ret);
 }
 
 function wpinv_display_tax_rate() {
-    $ret = wpinv_use_taxes() && wpinv_get_option( 'display_tax_rate', false );
+    $ret = wpinv_use_taxes() && wpinv_get_option('display_tax_rate', false);
 
-    return apply_filters( 'wpinv_display_tax_rate', $ret );
+    return apply_filters('wpinv_display_tax_rate', $ret);
 }
 
 function wpinv_cart_needs_tax_address_fields() {
-    if( !wpinv_is_cart_taxed() )
+    if (!wpinv_is_cart_taxed())
         return false;
 
-    return ! did_action( 'wpinv_after_cc_fields', 'wpinv_default_cc_address_fields' );
+    return !did_action('wpinv_after_cc_fields', 'wpinv_default_cc_address_fields');
 }
 
-function wpinv_item_is_tax_exclusive( $item_id = 0 ) {
-    $ret = (bool)get_post_meta( $item_id, '_wpinv_tax_exclusive', false );
-    return apply_filters( 'wpinv_is_tax_exclusive', $ret, $item_id );
+function wpinv_item_is_tax_exclusive($item_id = 0) {
+    $ret = (bool) get_post_meta($item_id, '_wpinv_tax_exclusive', false);
+    return apply_filters('wpinv_is_tax_exclusive', $ret, $item_id);
 }
 
-function wpinv_currency_decimal_filter( $decimals = 2 ) {
+function wpinv_currency_decimal_filter($decimals = 2) {
     $currency = wpinv_get_currency();
 
-    switch ( $currency ) {
+    switch ($currency) {
         case 'RIAL' :
         case 'JPY' :
         case 'TWD' :
@@ -206,48 +206,48 @@ 
             break;
     }
 
-    return apply_filters( 'wpinv_currency_decimal_count', $decimals, $currency );
+    return apply_filters('wpinv_currency_decimal_count', $decimals, $currency);
 }
 
 function wpinv_tax_amount() {
     $output = 0.00;
     
-    return apply_filters( 'wpinv_tax_amount', $output );
+    return apply_filters('wpinv_tax_amount', $output);
 }
 
 function wpinv_recalculated_tax() {
-    define( 'WPINV_RECALCTAX', true );
+    define('WPINV_RECALCTAX', true);
 }
-add_action( 'wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculated_tax', 1 );
+add_action('wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculated_tax', 1);
 
-function wpinv_recalculate_tax( $return = false ) {
-    $invoice_id = (int)wpinv_get_invoice_cart_id();
-    if ( empty( $invoice_id ) ) {
+function wpinv_recalculate_tax($return = false) {
+    $invoice_id = (int) wpinv_get_invoice_cart_id();
+    if (empty($invoice_id)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice_cart( $invoice_id );
+    $invoice = wpinv_get_invoice_cart($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    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'] ) );
+    $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->set('state', sanitize_text_field($_POST['state']));
     }
 
     $invoice->cart_details  = wpinv_get_cart_content_details();
     
-    $subtotal               = wpinv_get_cart_subtotal( $invoice->cart_details );
-    $tax                    = wpinv_get_cart_tax( $invoice->cart_details );
-    $total                  = wpinv_get_cart_total( $invoice->cart_details );
+    $subtotal               = wpinv_get_cart_subtotal($invoice->cart_details);
+    $tax                    = wpinv_get_cart_tax($invoice->cart_details);
+    $total                  = wpinv_get_cart_total($invoice->cart_details);
 
     $invoice->tax           = $tax;
     $invoice->subtotal      = $subtotal;
@@ -255,61 +255,61 @@ 
 
     $invoice->save();
     
-    if ( $invoice->is_free_trial() ) {
+    if ($invoice->is_free_trial()) {
         $total = 0;
     }
     
     $response = array(
-        'total'        => html_entity_decode( wpinv_price( wpinv_format_amount( $total ) ), ENT_COMPAT, 'UTF-8' ),
+        'total'        => html_entity_decode(wpinv_price(wpinv_format_amount($total)), ENT_COMPAT, 'UTF-8'),
         'total_raw'    => $total,
-        'free'         => !( (float)$total > 0 ) && $invoice->is_free() ? true : false,
-        'html'         => wpinv_checkout_cart( $invoice->cart_details, false ),
+        'free'         => !((float) $total > 0) && $invoice->is_free() ? true : false,
+        'html'         => wpinv_checkout_cart($invoice->cart_details, false),
     );
     
-    if ( $return ) {
+    if ($return) {
         return $response;
     }
 
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculate_tax' );
-add_action( 'wp_ajax_nopriv_wpinv_recalculate_tax', 'wpinv_recalculate_tax' );
+add_action('wp_ajax_wpinv_recalculate_tax', 'wpinv_recalculate_tax');
+add_action('wp_ajax_nopriv_wpinv_recalculate_tax', 'wpinv_recalculate_tax');
 
 // VAT Settings
-function wpinv_vat_rate_add_callback( $args ) {
+function wpinv_vat_rate_add_callback($args) {
     ?>
-    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_add" type="button" value="<?php esc_attr_e( 'Add', 'invoicing' );?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
+    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_add" type="button" value="<?php esc_attr_e('Add', 'invoicing'); ?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
     <?php
 }
 
-function wpinv_vat_rate_delete_callback( $args ) {
+function wpinv_vat_rate_delete_callback($args) {
     global $wpinv_euvat;
     
     $vat_classes = $wpinv_euvat->get_rate_classes();
-    $vat_class = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '';
-    if ( isset( $vat_classes[$vat_class] ) ) {
+    $vat_class = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '';
+    if (isset($vat_classes[$vat_class])) {
     ?>
-    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_delete" type="button" value="<?php echo wp_sprintf( esc_attr__( 'Delete class "%s"', 'invoicing' ), $vat_classes[$vat_class] );?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
+    <p class="wpi-vat-rate-actions"><input id="wpi_vat_rate_delete" type="button" value="<?php echo wp_sprintf(esc_attr__('Delete class "%s"', 'invoicing'), $vat_classes[$vat_class]); ?>" class="button button-primary" />&nbsp;&nbsp;<i style="display:none;" class="fa fa-refresh fa-spin"></i></p>
     <?php
     }
 }
 
-function wpinv_vat_rates_callback( $args ) {
+function wpinv_vat_rates_callback($args) {
     global $wpinv_euvat;
     
     $vat_classes    = $wpinv_euvat->get_rate_classes();
-    $vat_class      = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' && isset( $vat_classes[$_REQUEST['wpi_sub']] )? sanitize_text_field( $_REQUEST['wpi_sub'] ) : '_standard';
+    $vat_class      = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' && isset($vat_classes[$_REQUEST['wpi_sub']]) ? sanitize_text_field($_REQUEST['wpi_sub']) : '_standard';
     
     $eu_states      = $wpinv_euvat->get_eu_states();
     $countries      = wpinv_get_country_list();
     $vat_groups     = $wpinv_euvat->get_vat_groups();
-    $rates          = $wpinv_euvat->get_vat_rates( $vat_class );
+    $rates          = $wpinv_euvat->get_vat_rates($vat_class);
     ob_start();
 ?>
 </td><tr>
     <td colspan="2" class="wpinv_vat_tdbox">
-    <input type="hidden" name="wpi_vat_class" value="<?php echo $vat_class;?>" />
-    <p><?php echo ( isset( $args['desc'] ) ? $args['desc'] : '' ); ?></p>
+    <input type="hidden" name="wpi_vat_class" value="<?php echo $vat_class; ?>" />
+    <p><?php echo (isset($args['desc']) ? $args['desc'] : ''); ?></p>
     <table id="wpinv_vat_rates" class="wp-list-table widefat fixed posts">
         <colgroup>
             <col width="50px" />
@@ -321,43 +321,43 @@ 
         </colgroup>
         <thead>
             <tr>
-                <th scope="col" colspan="2" class="wpinv_vat_country_name"><?php _e( 'Country', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_vat_global" title="<?php esc_attr_e( 'Apply rate to whole country', 'invoicing' ); ?>"><?php _e( 'Country Wide', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_vat_rate"><?php _e( 'Rate %', 'invoicing' ); ?></th> 
-                <th scope="col" class="wpinv_vat_name"><?php _e( 'VAT Name', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_vat_group"><?php _e( 'Tax Group', 'invoicing' ); ?></th>
+                <th scope="col" colspan="2" class="wpinv_vat_country_name"><?php _e('Country', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_vat_global" title="<?php esc_attr_e('Apply rate to whole country', 'invoicing'); ?>"><?php _e('Country Wide', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_vat_rate"><?php _e('Rate %', 'invoicing'); ?></th> 
+                <th scope="col" class="wpinv_vat_name"><?php _e('VAT Name', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_vat_group"><?php _e('Tax Group', 'invoicing'); ?></th>
             </tr>
         </thead>
         <tbody>
-        <?php if( !empty( $eu_states ) ) { ?>
+        <?php if (!empty($eu_states)) { ?>
         <?php 
-        foreach ( $eu_states as $state ) { 
-            $country_name = isset( $countries[$state] ) ? $countries[$state] : '';
+        foreach ($eu_states as $state) { 
+            $country_name = isset($countries[$state]) ? $countries[$state] : '';
             
             // Filter the rate for each country
-            $country_rate = array_filter( $rates, function( $rate ) use( $state ) { return $rate['country'] === $state; } );
+            $country_rate = array_filter($rates, function($rate) use($state) { return $rate['country'] === $state; } );
             
             // If one does not exist create a default
-            $country_rate = is_array( $country_rate ) && count( $country_rate ) > 0 ? reset( $country_rate ) : array();
+            $country_rate = is_array($country_rate) && count($country_rate) > 0 ? reset($country_rate) : array();
             
-            $vat_global = isset( $country_rate['global'] ) ? !empty( $country_rate['global'] ) : true;
-            $vat_rate = isset( $country_rate['rate'] ) ? $country_rate['rate'] : '';
-            $vat_name = !empty( $country_rate['name'] ) ? esc_attr( stripslashes( $country_rate['name'] ) ) : '';
-            $vat_group = !empty( $country_rate['group'] ) ? $country_rate['group'] : ( $vat_class === '_standard' ? 'standard' : 'reduced' );
+            $vat_global = isset($country_rate['global']) ? !empty($country_rate['global']) : true;
+            $vat_rate = isset($country_rate['rate']) ? $country_rate['rate'] : '';
+            $vat_name = !empty($country_rate['name']) ? esc_attr(stripslashes($country_rate['name'])) : '';
+            $vat_group = !empty($country_rate['group']) ? $country_rate['group'] : ($vat_class === '_standard' ? 'standard' : 'reduced');
         ?>
         <tr>
             <td class="wpinv_vat_country"><?php echo $state; ?><input type="hidden" name="vat_rates[<?php echo $state; ?>][country]" value="<?php echo $state; ?>" /><input type="hidden" name="vat_rates[<?php echo $state; ?>][state]" value="" /></td>
             <td class="wpinv_vat_country_name"><?php echo $country_name; ?></td>
             <td class="wpinv_vat_global">
-                <input type="checkbox" name="vat_rates[<?php echo $state;?>][global]" id="vat_rates[<?php echo $state;?>][global]" value="1" <?php checked( true, $vat_global );?> disabled="disabled" />
-                <label for="tax_rates[<?php echo $state;?>][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label>
-                <input type="hidden" name="vat_rates[<?php echo $state;?>][global]" value="1" checked="checked" />
+                <input type="checkbox" name="vat_rates[<?php echo $state; ?>][global]" id="vat_rates[<?php echo $state; ?>][global]" value="1" <?php checked(true, $vat_global); ?> disabled="disabled" />
+                <label for="tax_rates[<?php echo $state; ?>][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label>
+                <input type="hidden" name="vat_rates[<?php echo $state; ?>][global]" value="1" checked="checked" />
             </td>
-            <td class="wpinv_vat_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="vat_rates[<?php echo $state;?>][rate]" value="<?php echo $vat_rate; ?>" /></td>
-            <td class="wpinv_vat_name"><input type="text" class="regular-text" name="vat_rates[<?php echo $state;?>][name]" value="<?php echo $vat_name; ?>" /></td>
+            <td class="wpinv_vat_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="vat_rates[<?php echo $state; ?>][rate]" value="<?php echo $vat_rate; ?>" /></td>
+            <td class="wpinv_vat_name"><input type="text" class="regular-text" name="vat_rates[<?php echo $state; ?>][name]" value="<?php echo $vat_name; ?>" /></td>
             <td class="wpinv_vat_group">
             <?php
-            echo wpinv_html_select( array(
+            echo wpinv_html_select(array(
                                         'name'             => 'vat_rates[' . $state . '][group]',
                                         'selected'         => $vat_group,
                                         'id'               => 'vat_rates[' . $state . '][group]',
@@ -366,14 +366,14 @@ 
                                         'multiple'         => false,
                                         'show_option_all'  => false,
                                         'show_option_none' => false
-                                    ) );
+                                    ));
             ?>
             </td>
         </tr>
         <?php } ?>
         <tr>
             <td colspan="6" style="background-color:#fafafa;">
-                <span><input id="wpi_vat_get_rates_group" type="button" class="button-secondary" value="<?php esc_attr_e( 'Update EU VAT Rates', 'invoicing' ); ?>" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span><span id="wpinv-rates-error-wrap" class="wpinv_errors" style="display:none;"></span>
+                <span><input id="wpi_vat_get_rates_group" type="button" class="button-secondary" value="<?php esc_attr_e('Update EU VAT Rates', 'invoicing'); ?>" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span><span id="wpinv-rates-error-wrap" class="wpinv_errors" style="display:none;"></span>
             </td>
         </tr>
         <?php } ?>
@@ -385,35 +385,35 @@ 
     echo $content;
 }
 
-function wpinv_vat_number_callback( $args ) {
+function wpinv_vat_number_callback($args) {
     global $wpinv_euvat;
     
     $vat_number     = $wpinv_euvat->get_vat_number();
     $vat_valid      = $wpinv_euvat->is_vat_validated();
 
-    $size           = ( isset( $args['size'] ) && !is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $validated_text = $vat_valid ? __( 'VAT number validated', 'invoicing' ) : __( 'VAT number not validated', 'invoicing' );
+    $size           = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $validated_text = $vat_valid ? __('VAT number validated', 'invoicing') : __('VAT number not validated', 'invoicing');
     $disabled       = $vat_valid ? 'disabled="disabled"' : " ";
     
-    $html = '<input type="text" class="' . $size . '-text" id="wpinv_settings[' . $args['id'] . ']" name="wpinv_settings[' . $args['id'] . ']" placeholder="GB123456789" value="' . esc_attr( stripslashes( $vat_number ) ) . '"/>';
-    $html .= '<span>&nbsp;<input type="button" id="wpinv_vat_validate" class="wpinv_validate_vat_button button-secondary" ' . $disabled . ' value="' . esc_attr__( 'Validate VAT Number', 'invoicing' ) . '" /></span>';
-    $html .= '<span class="wpinv-vat-stat wpinv-vat-stat-' . (int)$vat_valid . '"><i class="fa"></i> <font>' . $validated_text . '</font></span>';
-    $html .= '<label for="wpinv_settings[' . $args['id'] . ']">' . '<p>' . __( 'Enter your VAT number including country identifier, eg: GB123456789 (Settings must be saved after validation)', 'invoicing' ).'</p>' . '</label>';
-    $html .= '<input type="hidden" name="_wpi_nonce" value="' . wp_create_nonce( 'vat_validation' ) . '">';
+    $html = '<input type="text" class="' . $size . '-text" id="wpinv_settings[' . $args['id'] . ']" name="wpinv_settings[' . $args['id'] . ']" placeholder="GB123456789" value="' . esc_attr(stripslashes($vat_number)) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" id="wpinv_vat_validate" class="wpinv_validate_vat_button button-secondary" ' . $disabled . ' value="' . esc_attr__('Validate VAT Number', 'invoicing') . '" /></span>';
+    $html .= '<span class="wpinv-vat-stat wpinv-vat-stat-' . (int) $vat_valid . '"><i class="fa"></i> <font>' . $validated_text . '</font></span>';
+    $html .= '<label for="wpinv_settings[' . $args['id'] . ']">' . '<p>' . __('Enter your VAT number including country identifier, eg: GB123456789 (Settings must be saved after validation)', 'invoicing') . '</p>' . '</label>';
+    $html .= '<input type="hidden" name="_wpi_nonce" value="' . wp_create_nonce('vat_validation') . '">';
 
     echo $html;
 }
 
-function wpinv_eu_fallback_rate_callback( $args ) {
+function wpinv_eu_fallback_rate_callback($args) {
     global $wpinv_options;
 
-    $value = isset( $wpinv_options[$args['id']] ) ? $wpinv_options[ $args['id'] ] : ( isset( $args['std'] ) ? $args['std'] : '' );
-    $size = ( isset( $args['size'] ) && !is_null( $args['size'] ) ) ? $args['size'] : 'small';
+    $value = isset($wpinv_options[$args['id']]) ? $wpinv_options[$args['id']] : (isset($args['std']) ? $args['std'] : '');
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'small';
     
-    $html = '<input type="number" min="0" max="99" step="any" class="' . $size . '-text" id="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '" name="wpinv_settings[' . $args['id'] . ']" value="' . esc_attr( stripslashes( $value ) ) . '" />';
-    $html .= '<span>&nbsp;<input id="wpi_add_eu_states" type="button" class="button-secondary" value="' . esc_attr__( 'Add EU Member States', 'invoicing' ) . '" /></span>';
-    $html .= '<span>&nbsp;<input id="wpi_remove_eu_states" type="button" class="button-secondary" value="' . esc_attr__( 'Remove EU Member States', 'invoicing' ) . '" /></span>';
-    $html .= '<span>&nbsp;<input id="wpi_vat_get_rates" type="button" class="button-secondary" value="' . esc_attr__( 'Update EU VAT Rates', 'invoicing' ) . '" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span>';
+    $html = '<input type="number" min="0" max="99" step="any" class="' . $size . '-text" id="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '" name="wpinv_settings[' . $args['id'] . ']" value="' . esc_attr(stripslashes($value)) . '" />';
+    $html .= '<span>&nbsp;<input id="wpi_add_eu_states" type="button" class="button-secondary" value="' . esc_attr__('Add EU Member States', 'invoicing') . '" /></span>';
+    $html .= '<span>&nbsp;<input id="wpi_remove_eu_states" type="button" class="button-secondary" value="' . esc_attr__('Remove EU Member States', 'invoicing') . '" /></span>';
+    $html .= '<span>&nbsp;<input id="wpi_vat_get_rates" type="button" class="button-secondary" value="' . esc_attr__('Update EU VAT Rates', 'invoicing') . '" />&nbsp;&nbsp;<i style="display:none" class="fa fa-refresh fa-spin"></i></span>';
     $html .= '<p><label for="wpinv_settings_' . $args['section'] . '_' . $args['id'] . '">' . $args['desc'] . '</label></p>';
     echo $html;
     ?>
@@ -421,36 +421,36 @@ 
     <?php
 }
 
-function wpinv_vat_ip_lookup_callback( $args ) {
+function wpinv_vat_ip_lookup_callback($args) {
     global $wpinv_options, $wpinv_euvat;
 
-    $value =  isset( $wpinv_options[ $args['id'] ] ) ? $wpinv_options[ $args['id'] ]  : ( isset( $args['std'] ) ? $args['std'] : 'default' );
+    $value = isset($wpinv_options[$args['id']]) ? $wpinv_options[$args['id']] : (isset($args['std']) ? $args['std'] : 'default');
     
     $options = array();
-    if ( function_exists( 'geoip_country_code_by_name' ) ) {
-        $options['geoip'] = __( 'PHP GeoIP extension', 'invoicing' );
+    if (function_exists('geoip_country_code_by_name')) {
+        $options['geoip'] = __('PHP GeoIP extension', 'invoicing');
     }
     
     $geoip2_database = $wpinv_euvat->geoip2_country_dbfile();
     
-    if ( !function_exists( 'bcadd' ) ) {
-        $geoip2_message = __( 'GeoIP2 service requires the BC Math PHP extension, it is not loaded in your version of PHP!', 'invoicing' );
+    if (!function_exists('bcadd')) {
+        $geoip2_message = __('GeoIP2 service requires the BC Math PHP extension, it is not loaded in your version of PHP!', 'invoicing');
     } else {
-        $geoip2_message = ini_get('safe_mode') ? __( 'GeoIP2 is not supported with PHP safe mode enabled!', 'invoicing' ) : '';
+        $geoip2_message = ini_get('safe_mode') ? __('GeoIP2 is not supported with PHP safe mode enabled!', 'invoicing') : '';
     }
     
-    if ( $geoip2_database !== false && empty( $geoip2_message ) ) {
-        $options['geoip2'] = __( 'GeoIP2 Database', 'invoicing' );
+    if ($geoip2_database !== false && empty($geoip2_message)) {
+        $options['geoip2'] = __('GeoIP2 Database', 'invoicing');
     }
     
-    if ( function_exists( 'simplexml_load_file' ) ) {
-        $options['geoplugin'] = __( 'geoPlugin Web Service', 'invoicing' );
+    if (function_exists('simplexml_load_file')) {
+        $options['geoplugin'] = __('geoPlugin Web Service', 'invoicing');
     }
     
-    $options['site']    = __( 'Use default country', 'invoicing' );
-    $options['default'] = __( 'Auto', 'invoicing' );
+    $options['site']    = __('Use default country', 'invoicing');
+    $options['default'] = __('Auto', 'invoicing');
 
-    $html = wpinv_html_select( array(
+    $html = wpinv_html_select(array(
         'name'             => "wpinv_settings[{$args['id']}]",
         'selected'         => $value,
         'id'               => "wpinv_settings[{$args['id']}]",
@@ -462,23 +462,23 @@ 
     ));
     
     $desc = '<label for="wpinv_settings[' . $args['id'] . ']">';
-    $desc .= __( 'Select the option Invoicing should use to determine the country from the IP address of the user.', 'invoicing' );
+    $desc .= __('Select the option Invoicing should use to determine the country from the IP address of the user.', 'invoicing');
     $desc .= '<p>';
-    if ( empty( $geoip2_message ) ) {
-        if ( $geoip2_database ) {
+    if (empty($geoip2_message)) {
+        if ($geoip2_database) {
             $last_updated = '';
-            if ( $time_updated = wpinv_get_option( 'wpinv_geoip2_date_updated' ) ) {
-                $date_updated = date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $time_updated );
-                $last_updated = '<br>' . sprintf( __( 'The GeoIP2 database was last updated on: <b>%s</b>', 'invoicing' ), $date_updated );
+            if ($time_updated = wpinv_get_option('wpinv_geoip2_date_updated')) {
+                $date_updated = date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $time_updated);
+                $last_updated = '<br>' . sprintf(__('The GeoIP2 database was last updated on: <b>%s</b>', 'invoicing'), $date_updated);
             }
-            $desc .= __(  'GeoIP2 database exists:', 'invoicing' ) . $last_updated . '&nbsp;<input type="button" id="wpi_geoip2" action="update" class="wpinv-refresh-geoip2-btn button-secondary" value="' . __( 'Update GeoIP2 database now (~30MB)', 'invoicing' ) . '"></input>';
+            $desc .= __('GeoIP2 database exists:', 'invoicing') . $last_updated . '&nbsp;<input type="button" id="wpi_geoip2" action="update" class="wpinv-refresh-geoip2-btn button-secondary" value="' . __('Update GeoIP2 database now (~30MB)', 'invoicing') . '"></input>';
         } else {
-            $desc .= __( 'GeoIP2 database does not exist:', 'invoicing' ) . '&nbsp;<input type="button" id="wpi_geoip2" action="download" class="wpinv-download-geoip2-btn button-secondary" value="' . __( 'Download GeoIP2 database now', 'invoicing' ) . ' (~30MB)"></input><br>' . __(  'After downloading the GeoIP2 database the GeoIP2 lookup option will show.', 'invoicing' );
+            $desc .= __('GeoIP2 database does not exist:', 'invoicing') . '&nbsp;<input type="button" id="wpi_geoip2" action="download" class="wpinv-download-geoip2-btn button-secondary" value="' . __('Download GeoIP2 database now', 'invoicing') . ' (~30MB)"></input><br>' . __('After downloading the GeoIP2 database the GeoIP2 lookup option will show.', 'invoicing');
         }
     } else {
         $desc .= $geoip2_message;
     }
-    $desc .= '</p><p>'. __( 'geoPlugin is a great free service please consider supporting them: ', 'invoicing' ) . ' <a href="http://www.geoplugin.com/" target="_blank">GeoPlugin.com</a></p>';
+    $desc .= '</p><p>' . __('geoPlugin is a great free service please consider supporting them: ', 'invoicing') . ' <a href="http://www.geoplugin.com/" target="_blank">GeoPlugin.com</a></p>';
     $desc .= '</label>';
     
     $html .= $desc;
@@ -494,23 +494,23 @@ 
  * 
  * @param string|bool|null $vat_rule
  */
-function getpaid_filter_vat_rule( $vat_rule ) {
+function getpaid_filter_vat_rule($vat_rule) {
     global $wpinv_euvat;
 
-    if ( empty( $vat_rule ) ) {        
+    if (empty($vat_rule)) {        
         return $wpinv_euvat->allow_vat_rules() ? 'digital' : 'physical';
     }
 
     return $vat_rule;
 }
-add_filter( 'wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule' );
+add_filter('wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule');
 
 /**
  * Filters the VAT class to ensure that each item has a VAT class.
  * 
  * @param string|bool|null $vat_rule
  */
-function getpaid_filter_vat_class( $vat_class ) {
-    return empty( $vat_class ) ? '_standard' : $vat_class;
+function getpaid_filter_vat_class($vat_class) {
+    return empty($vat_class) ? '_standard' : $vat_class;
 }
-add_filter( 'wpinv_get_item_vat_class', 'getpaid_filter_vat_class' );
\ No newline at end of file
+add_filter('wpinv_get_item_vat_class', 'getpaid_filter_vat_class');
\ No newline at end of file

includes/wpinv-post-types.php

Indentation +8 added lines, -8 removed lines

@@ -140,8 +140,8 @@ 
 
 function wpinv_get_default_labels() {
     $defaults = array(
-       'singular' => __( 'Invoice', 'invoicing' ),
-       'plural'   => __( 'Invoices', 'invoicing' )
+        'singular' => __( 'Invoice', 'invoicing' ),
+        'plural'   => __( 'Invoices', 'invoicing' )
     );
     
     return apply_filters( 'wpinv_default_invoices_name', $defaults );
@@ -160,20 +160,20 @@ 
 }
 
 function wpinv_change_default_title( $title ) {
-     if ( !is_admin() ) {
+        if ( !is_admin() ) {
         $label = wpinv_get_label_singular();
         $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
         return $title;
-     }
+        }
 
-     $screen = get_current_screen();
+        $screen = get_current_screen();
 
-     if ( 'wpi_invoice' == $screen->post_type ) {
+        if ( 'wpi_invoice' == $screen->post_type ) {
         $label = wpinv_get_label_singular();
         $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
-     }
+        }
 
-     return $title;
+        return $title;
 }
 add_filter( 'enter_title_here', 'wpinv_change_default_title' );
 

Spacing +117 added lines, -117 removed lines

@@ -7,41 +7,41 @@ 
  */
  
 // 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( 'init', 'wpinv_register_post_types', 1 );
+add_action('init', 'wpinv_register_post_types', 1);
 function wpinv_register_post_types() {
 
     $items_labels = array(
-        'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'wpi_item', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-        'new_item'           => __( 'New Item', 'invoicing' ),
-        'edit_item'          => __( 'Edit Item', 'invoicing' ),
-        'view_item'          => __( 'View Item', 'invoicing' ),
-        'all_items'          => __( 'Items', 'invoicing' ),
-        'search_items'       => __( 'Search Items', 'invoicing' ),
+        'name'               => _x('Items', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Item', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Items', 'admin menu', 'invoicing'),
+        'add_new'            => _x('Add New', 'wpi_item', 'invoicing'),
+        'add_new_item'       => __('Add New Item', 'invoicing'),
+        'new_item'           => __('New Item', 'invoicing'),
+        'edit_item'          => __('Edit Item', 'invoicing'),
+        'view_item'          => __('View Item', 'invoicing'),
+        'all_items'          => __('Items', 'invoicing'),
+        'search_items'       => __('Search Items', 'invoicing'),
         'parent_item_colon'  => '',
-        'not_found'          => __( 'No items found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
+        'not_found'          => __('No items found.', 'invoicing'),
+        'not_found_in_trash' => __('No items found in trash.', 'invoicing')
     );
-    $items_labels = apply_filters( 'wpinv_items_labels', $items_labels );
+    $items_labels = apply_filters('wpinv_items_labels', $items_labels);
 
     $cap_type          = 'wpi_item';
     $invoice_item_args = array(
         'labels'                => $items_labels,
-        'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
+        'description'           => __('This is where you can add new invoice items.', 'invoicing'),
         'public'                => false,
         'has_archive'           => false,
         '_builtin'              => false,
         'show_ui'               => true,
         'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
         'show_in_nav_menus'     => false,
-        'supports'              => array( 'title', 'excerpt' ),
+        'supports'              => array('title', 'excerpt'),
         'register_meta_box_cb'  => 'wpinv_register_item_meta_boxes',
         'rewrite'               => false,
         'query_var'             => false,
@@ -68,9 +68,9 @@ 
         ),
         'can_export'            => true,
     );
-    $invoice_item_args = apply_filters( 'wpinv_register_post_type_invoice_item', $invoice_item_args );
+    $invoice_item_args = apply_filters('wpinv_register_post_type_invoice_item', $invoice_item_args);
 
-    register_post_type( 'wpi_item', $invoice_item_args );
+    register_post_type('wpi_item', $invoice_item_args);
 
     $cap_type = 'wpi_payment_form';
     register_post_type(
@@ -79,22 +79,22 @@ 
             'wpinv_register_post_type_payment_form',
             array(
                 'labels'             => array(
-                    'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
-                    'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
-                    'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
-                    'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
-                    'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
-                    'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
-                    'new_item'           => __( 'New Payment Form', 'invoicing' ),
-                    'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
-                    'view_item'          => __( 'View Payment Form', 'invoicing' ),
-                    'all_items'          => __( 'Payment Forms', 'invoicing' ),
-                    'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
-                    'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
-                    'not_found'          => __( 'No payment forms found.', 'invoicing' ),
-                    'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
+                    'name'               => _x('Payment Forms', 'post type general name', 'invoicing'),
+                    'singular_name'      => _x('Payment Form', 'post type singular name', 'invoicing'),
+                    'menu_name'          => _x('Payment Forms', 'admin menu', 'invoicing'),
+                    'name_admin_bar'     => _x('Payment Form', 'add new on admin bar', 'invoicing'),
+                    'add_new'            => _x('Add New', 'Payment Form', 'invoicing'),
+                    'add_new_item'       => __('Add New Payment Form', 'invoicing'),
+                    'new_item'           => __('New Payment Form', 'invoicing'),
+                    'edit_item'          => __('Edit Payment Form', 'invoicing'),
+                    'view_item'          => __('View Payment Form', 'invoicing'),
+                    'all_items'          => __('Payment Forms', 'invoicing'),
+                    'search_items'       => __('Search Payment Forms', 'invoicing'),
+                    'parent_item_colon'  => __('Parent Payment Forms:', 'invoicing'),
+                    'not_found'          => __('No payment forms found.', 'invoicing'),
+                    'not_found_in_trash' => __('No payment forms found in trash.', 'invoicing')
                 ),
-                'description'        => __( 'Stores payment forms.', 'invoicing' ),
+                'description'        => __('Stores payment forms.', 'invoicing'),
                 'public'             => false,
                 'show_ui'            => true,
                 'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : true,
@@ -105,37 +105,37 @@ 
                 'has_archive'        => false,
                 'hierarchical'       => false,
                 'menu_position'      => null,
-                'supports'           => array( 'title' ),
+                'supports'           => array('title'),
                 'menu_icon'          => 'dashicons-media-form',
             )
         )
     );
 
     $labels = array(
-        'name'               => _x( 'Invoices', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Invoice', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Invoices', 'admin menu', 'invoicing' ),
-        'name_admin_bar'     => _x( 'Invoice', 'add new on admin bar', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'book', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Invoice', 'invoicing' ),
-        'new_item'           => __( 'New Invoice', 'invoicing' ),
-        'edit_item'          => __( 'Edit Invoice', 'invoicing' ),
-        'view_item'          => __( 'View Invoice', 'invoicing' ),
-        'all_items'          => __( 'Invoices', 'invoicing' ),
-        'search_items'       => __( 'Search Invoices', 'invoicing' ),
-        'parent_item_colon'  => __( 'Parent Invoices:', 'invoicing' ),
-        'not_found'          => __( 'No invoices found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No invoices found in trash.', 'invoicing' )
+        'name'               => _x('Invoices', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Invoice', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Invoices', 'admin menu', 'invoicing'),
+        'name_admin_bar'     => _x('Invoice', 'add new on admin bar', 'invoicing'),
+        'add_new'            => _x('Add New', 'book', 'invoicing'),
+        'add_new_item'       => __('Add New Invoice', 'invoicing'),
+        'new_item'           => __('New Invoice', 'invoicing'),
+        'edit_item'          => __('Edit Invoice', 'invoicing'),
+        'view_item'          => __('View Invoice', 'invoicing'),
+        'all_items'          => __('Invoices', 'invoicing'),
+        'search_items'       => __('Search Invoices', 'invoicing'),
+        'parent_item_colon'  => __('Parent Invoices:', 'invoicing'),
+        'not_found'          => __('No invoices found.', 'invoicing'),
+        'not_found_in_trash' => __('No invoices found in trash.', 'invoicing')
     );
-    $labels = apply_filters( 'wpinv_labels', $labels );
+    $labels = apply_filters('wpinv_labels', $labels);
     
     $menu_icon = WPINV_PLUGIN_URL . '/assets/images/favicon.ico';
-    $menu_icon = apply_filters( 'wpinv_menu_icon_invoice', $menu_icon );
+    $menu_icon = apply_filters('wpinv_menu_icon_invoice', $menu_icon);
 
     $cap_type = 'wpi_invoice';
     $args = array(
         'labels'             => $labels,
-        'description'        => __( 'This is where invoices are stored.', 'invoicing' ),
+        'description'        => __('This is where invoices are stored.', 'invoicing'),
         'public'             => true,
         'can_export'         => true,
         '_builtin'           => false,
@@ -168,37 +168,37 @@ 
         'has_archive'        => false,
         'hierarchical'       => false,
         'menu_position'      => null,
-        'supports'           => array( 'title', 'author', 'excerpt'  ),
+        'supports'           => array('title', 'author', 'excerpt'),
         'menu_icon'          => 'dashicons-media-spreadsheet',
     );
             
-    $args = apply_filters( 'wpinv_register_post_type_invoice', $args );
+    $args = apply_filters('wpinv_register_post_type_invoice', $args);
     
-    register_post_type( 'wpi_invoice', $args );
+    register_post_type('wpi_invoice', $args);
 
     $labels = array(
-        'name'               => _x( 'Discounts', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Discount', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Discounts', 'admin menu', 'invoicing' ),
-        'name_admin_bar'     => _x( 'Discount', 'add new on admin bar', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'book', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Discount', 'invoicing' ),
-        'new_item'           => __( 'New Discount', 'invoicing' ),
-        'edit_item'          => __( 'Edit Discount', 'invoicing' ),
-        'view_item'          => __( 'View Discount', 'invoicing' ),
-        'all_items'          => __( 'Discounts', 'invoicing' ),
-        'search_items'       => __( 'Search Discounts', 'invoicing' ),
-        'parent_item_colon'  => __( 'Parent Discounts:', 'invoicing' ),
-        'not_found'          => __( 'No discounts found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No discounts found in trash.', 'invoicing' )
+        'name'               => _x('Discounts', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Discount', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Discounts', 'admin menu', 'invoicing'),
+        'name_admin_bar'     => _x('Discount', 'add new on admin bar', 'invoicing'),
+        'add_new'            => _x('Add New', 'book', 'invoicing'),
+        'add_new_item'       => __('Add New Discount', 'invoicing'),
+        'new_item'           => __('New Discount', 'invoicing'),
+        'edit_item'          => __('Edit Discount', 'invoicing'),
+        'view_item'          => __('View Discount', 'invoicing'),
+        'all_items'          => __('Discounts', 'invoicing'),
+        'search_items'       => __('Search Discounts', 'invoicing'),
+        'parent_item_colon'  => __('Parent Discounts:', 'invoicing'),
+        'not_found'          => __('No discounts found.', 'invoicing'),
+        'not_found_in_trash' => __('No discounts found in trash.', 'invoicing')
     );
-    $labels = apply_filters( 'wpinv_discounts_labels', $labels );
+    $labels = apply_filters('wpinv_discounts_labels', $labels);
 
     $cap_type = 'wpi_discount';
     
     $args = array(
         'labels'             => $labels,
-        'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+        'description'        => __('This is where you can add new discounts that users can use in invoices.', 'invoicing'),
         'public'             => false,
         'can_export'         => true,
         '_builtin'           => false,
@@ -229,7 +229,7 @@ 
         ),
         'has_archive'        => false,
         'hierarchical'       => false,
-        'supports'           => array( 'title', 'excerpt' ),
+        'supports'           => array('title', 'excerpt'),
         'register_meta_box_cb'  => 'wpinv_register_discount_meta_boxes',
         'show_in_nav_menus'  => false,
         'show_in_admin_bar'  => true,
@@ -237,106 +237,106 @@ 
         'menu_position'      => null,
     );
             
-    $args = apply_filters( 'wpinv_register_post_type_discount', $args );
+    $args = apply_filters('wpinv_register_post_type_discount', $args);
     
-    register_post_type( 'wpi_discount', $args );
+    register_post_type('wpi_discount', $args);
 }
 
 function wpinv_get_default_labels() {
     $defaults = array(
-       'singular' => __( 'Invoice', 'invoicing' ),
-       'plural'   => __( 'Invoices', 'invoicing' )
+       'singular' => __('Invoice', 'invoicing'),
+       'plural'   => __('Invoices', 'invoicing')
     );
     
-    return apply_filters( 'wpinv_default_invoices_name', $defaults );
+    return apply_filters('wpinv_default_invoices_name', $defaults);
 }
 
-function wpinv_get_label_singular( $lowercase = false ) {
+function wpinv_get_label_singular($lowercase = false) {
     $defaults = wpinv_get_default_labels();
     
-    return ($lowercase) ? strtolower( $defaults['singular'] ) : $defaults['singular'];
+    return ($lowercase) ? strtolower($defaults['singular']) : $defaults['singular'];
 }
 
-function wpinv_get_label_plural( $lowercase = false ) {
+function wpinv_get_label_plural($lowercase = false) {
     $defaults = wpinv_get_default_labels();
     
-    return ( $lowercase ) ? strtolower( $defaults['plural'] ) : $defaults['plural'];
+    return ($lowercase) ? strtolower($defaults['plural']) : $defaults['plural'];
 }
 
-function wpinv_change_default_title( $title ) {
-     if ( !is_admin() ) {
+function wpinv_change_default_title($title) {
+     if (!is_admin()) {
         $label = wpinv_get_label_singular();
-        $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
+        $title = sprintf(__('Enter %s name here', 'invoicing'), $label);
         return $title;
      }
 
      $screen = get_current_screen();
 
-     if ( 'wpi_invoice' == $screen->post_type ) {
+     if ('wpi_invoice' == $screen->post_type) {
         $label = wpinv_get_label_singular();
-        $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
+        $title = sprintf(__('Enter %s name here', 'invoicing'), $label);
      }
 
      return $title;
 }
-add_filter( 'enter_title_here', 'wpinv_change_default_title' );
+add_filter('enter_title_here', 'wpinv_change_default_title');
 
 function wpinv_register_post_status() {
-    register_post_status( 'wpi-pending', array(
-        'label'                     => _x( 'Pending', 'Invoice status', 'invoicing' ),
+    register_post_status('wpi-pending', array(
+        'label'                     => _x('Pending', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-processing', array(
-        'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-processing', array(
+        'label'                     => _x('Processing', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-onhold', array(
-        'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-onhold', array(
+        'label'                     => _x('On Hold', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-cancelled', array(
-        'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-cancelled', array(
+        'label'                     => _x('Cancelled', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-refunded', array(
-        'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-refunded', array(
+        'label'                     => _x('Refunded', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-failed', array(
-        'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-failed', array(
+        'label'                     => _x('Failed', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-renewal', array(
-        'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-renewal', array(
+        'label'                     => _x('Renewal', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
-    ) );
+        'label_count'               => _n_noop('Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing')
+    ));
 }
-add_action( 'init', 'wpinv_register_post_status', 10 );
+add_action('init', 'wpinv_register_post_status', 10);

includes/libraries/GeoIp2/Model/City.php

Spacing +1 added lines, -2 removed lines

@@ -130,7 +130,6 @@
     private function mostSpecificSubdivision()
     {
         return empty($this->subdivisions) ?
-            new \GeoIp2\Record\Subdivision(array(), $this->locales) :
-            end($this->subdivisions);
+            new \GeoIp2\Record\Subdivision(array(), $this->locales) : end($this->subdivisions);
     }
 }

includes/libraries/GeoIp2/WebService/Client.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         // This is for backwards compatibility. Do not remove except for a
         // major version bump.
         if (is_string($options)) {
-            $options = array( 'host' => $options );
+            $options = array('host' => $options);
         }
 
         if (!isset($options['host'])) {