AyeCode / invoicing

includes/class-getpaid-tax.php

Indentation +192 added lines, -192 removed lines

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

Spacing +43 added lines, -43 removed lines

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

includes/wpinv-tax-functions.php

Spacing +130 added lines, -130 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Returns an array of eu states.
@@ -12,7 +12,7 @@ 
  * @return array
  */
 function getpaid_get_eu_states() {
-    return wpinv_get_data( 'eu-states' );
+    return wpinv_get_data('eu-states');
 }
 
 /**
@@ -20,8 +20,8 @@ 
  *
  * @return bool
  */
-function getpaid_is_eu_state( $country ) {
-    return ! empty( $country ) && in_array( strtoupper( $country ), getpaid_get_eu_states() ) ? true : false;
+function getpaid_is_eu_state($country) {
+    return !empty($country) && in_array(strtoupper($country), getpaid_get_eu_states()) ? true : false;
 }
 
 /**
@@ -30,7 +30,7 @@ 
  * @return array
  */
 function getpaid_get_gst_states() {
-    return array( 'AU', 'NZ', 'CA', 'CN' );
+    return array('AU', 'NZ', 'CA', 'CN');
 }
 
 /**
@@ -38,8 +38,8 @@ 
  *
  * @return bool
  */
-function getpaid_is_gst_country( $country ) {
-    return ! empty( $country ) && in_array( strtoupper( $country ), getpaid_get_gst_states() ) ? true : false;
+function getpaid_is_gst_country($country) {
+    return !empty($country) && in_array(strtoupper($country), getpaid_get_gst_states()) ? true : false;
 }
 
 /**
@@ -49,8 +49,8 @@ 
  */
 function wpinv_use_taxes() {
 
-    $ret = wpinv_get_option( 'enable_taxes', false );
-    return (bool) apply_filters( 'wpinv_use_taxes', ! empty( $ret ) );
+    $ret = wpinv_get_option('enable_taxes', false);
+    return (bool) apply_filters('wpinv_use_taxes', !empty($ret));
 
 }
 
@@ -60,7 +60,7 @@ 
  * @param WPInv_Invoice $invoice
  * @return bool
  */
-function wpinv_is_invoice_taxable( $invoice ) {
+function wpinv_is_invoice_taxable($invoice) {
     return $invoice->is_taxable();
 }
 
@@ -70,11 +70,11 @@ 
  * @param string $country
  * @return bool
  */
-function wpinv_is_country_taxable( $country ) {
-    $is_eu     = getpaid_is_eu_state( $country );
-    $is_exempt = ! $is_eu && wpinv_is_base_country( $country ) && wpinv_same_country_exempt_vat();
+function wpinv_is_country_taxable($country) {
+    $is_eu     = getpaid_is_eu_state($country);
+    $is_exempt = !$is_eu && wpinv_is_base_country($country) && wpinv_same_country_exempt_vat();
 
-    return (bool) apply_filters( 'wpinv_is_country_taxable', ! $is_exempt, $country );
+    return (bool) apply_filters('wpinv_is_country_taxable', !$is_exempt, $country);
 
 }
 
@@ -84,7 +84,7 @@ 
  * @param WPInv_Item|GetPaid_Form_Item $item
  * @return bool
  */
-function wpinv_is_item_taxable( $item ) {
+function wpinv_is_item_taxable($item) {
     return '_exempt' != $item->get_vat_rule();
 }
 
@@ -93,15 +93,15 @@ 
  *
  * @return bool
  */
-function wpinv_use_store_address_as_tax_base( $tax_rule = false ) {
-    $use_base = wpinv_get_option( 'tax_base', 'billing' ) === 'base';
+function wpinv_use_store_address_as_tax_base($tax_rule = false) {
+    $use_base = wpinv_get_option('tax_base', 'billing') === 'base';
 
-    if ( $tax_rule ) {
-        $rules    = getpaid_get_tax_rules( 'tax_base' );
-        $use_base = isset( $rules[ $tax_rule ] ) ? 'base' === $rules[ $tax_rule ] : $use_base;
+    if ($tax_rule) {
+        $rules    = getpaid_get_tax_rules('tax_base');
+        $use_base = isset($rules[$tax_rule]) ? 'base' === $rules[$tax_rule] : $use_base;
     }
 
-    return (bool) apply_filters( 'wpinv_use_store_address_as_tax_base', $use_base, $tax_rule );
+    return (bool) apply_filters('wpinv_use_store_address_as_tax_base', $use_base, $tax_rule);
 }
 
 /**
@@ -109,15 +109,15 @@ 
  *
  * @return bool
  */
-function wpinv_get_vat_same_country_rule( $tax_rule = false ) {
-    $rule = wpinv_get_option( 'vat_same_country_rule', 'vat_too' );
+function wpinv_get_vat_same_country_rule($tax_rule = false) {
+    $rule = wpinv_get_option('vat_same_country_rule', 'vat_too');
 
-    if ( $tax_rule ) {
-        $rules = getpaid_get_tax_rules( 'same_country_rule' );
-        $rule  = isset( $rules[ $tax_rule ] ) ? $rules[ $tax_rule ] : $rule;
+    if ($tax_rule) {
+        $rules = getpaid_get_tax_rules('same_country_rule');
+        $rule  = isset($rules[$tax_rule]) ? $rules[$tax_rule] : $rule;
     }
 
-    return (bool) apply_filters( 'wpinv_get_vat_same_country_rule', $rule, $tax_rule );
+    return (bool) apply_filters('wpinv_get_vat_same_country_rule', $rule, $tax_rule);
 }
 
 /**
@@ -126,8 +126,8 @@ 
  * @return bool
  */
 function wpinv_prices_include_tax() {
-    $is_inclusive = wpinv_get_option( 'prices_include_tax', 'no' ) == 'yes';
-    return (bool) apply_filters( 'wpinv_prices_include_tax', $is_inclusive );
+    $is_inclusive = wpinv_get_option('prices_include_tax', 'no') == 'yes';
+    return (bool) apply_filters('wpinv_prices_include_tax', $is_inclusive);
 }
 
 /**
@@ -136,8 +136,8 @@ 
  * @return bool
  */
 function wpinv_round_tax_per_tax_rate() {
-    $subtotal_rounding = wpinv_get_option( 'tax_subtotal_rounding', 1 );
-    return (bool) apply_filters( 'wpinv_round_tax_per_tax_rate', empty( $subtotal_rounding ) );
+    $subtotal_rounding = wpinv_get_option('tax_subtotal_rounding', 1);
+    return (bool) apply_filters('wpinv_round_tax_per_tax_rate', empty($subtotal_rounding));
 }
 
 /**
@@ -146,8 +146,8 @@ 
  * @return bool
  */
 function wpinv_display_individual_tax_rates() {
-    $individual = wpinv_get_option( 'tax_display_totals', 'single' ) == 'individual';
-    return (bool) apply_filters( 'wpinv_display_individual_tax_rates', $individual );
+    $individual = wpinv_get_option('tax_display_totals', 'single') == 'individual';
+    return (bool) apply_filters('wpinv_display_individual_tax_rates', $individual);
 }
 
 /**
@@ -156,8 +156,8 @@ 
  * @return float
  */
 function wpinv_get_default_tax_rate() {
-    $rate = wpinv_get_option( 'tax_rate', 0 );
-    return (float) apply_filters( 'wpinv_get_default_tax_rate', floatval( $rate ) );
+    $rate = wpinv_get_option('tax_rate', 0);
+    return (float) apply_filters('wpinv_get_default_tax_rate', floatval($rate));
 }
 
 /**
@@ -166,7 +166,7 @@ 
  * @return bool
  */
 function wpinv_same_country_exempt_vat() {
-    return 'no' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' );
+    return 'no' == wpinv_get_option('vat_same_country_rule', 'vat_too');
 }
 
 /**
@@ -186,28 +186,28 @@ 
  * @param string $state
  * @return array
  */
-function getpaid_get_item_tax_rates( $item, $country = '', $state = '' ) {
+function getpaid_get_item_tax_rates($item, $country = '', $state = '') {
 
     // Abort if the item is not taxable.
-    if ( ! wpinv_is_item_taxable( $item ) ) {
+    if (!wpinv_is_item_taxable($item)) {
         return array();
     }
 
     // Maybe use the store address.
-    if ( wpinv_use_store_address_as_tax_base( $item->get_vat_rule() ) ) {
+    if (wpinv_use_store_address_as_tax_base($item->get_vat_rule())) {
         $country = wpinv_get_default_country();
         $state   = wpinv_get_default_state();
     }
 
     // Retrieve tax rates.
-    $tax_rates = GetPaid_Tax::get_address_tax_rates( $country, $state );
+    $tax_rates = GetPaid_Tax::get_address_tax_rates($country, $state);
 
     // Fallback to the default tax rates if non were found.
-    if ( empty( $tax_rates ) ) {
+    if (empty($tax_rates)) {
         $tax_rates = GetPaid_Tax::get_default_tax_rates();
     }
 
-    return apply_filters( 'getpaid_get_item_tax_rates', $tax_rates, $item, $country, $state );
+    return apply_filters('getpaid_get_item_tax_rates', $tax_rates, $item, $country, $state);
 }
 
 /**
@@ -217,22 +217,22 @@ 
  * @param array $rates
  * @return array
  */
-function getpaid_filter_item_tax_rates( $item, $rates ) {
+function getpaid_filter_item_tax_rates($item, $rates) {
 
     $tax_class = $item->get_vat_class();
 
-    foreach ( $rates as $i => $rate ) {
+    foreach ($rates as $i => $rate) {
 
-        if ( $tax_class == '_reduced' ) {
-            $rates[ $i ]['rate'] = empty( $rate['reduced_rate'] ) ? 0 : $rate['reduced_rate'];
+        if ($tax_class == '_reduced') {
+            $rates[$i]['rate'] = empty($rate['reduced_rate']) ? 0 : $rate['reduced_rate'];
         }
 
-        if ( $tax_class == '_exempt' ) {
-            $rates[ $i ]['rate'] = 0;
+        if ($tax_class == '_exempt') {
+            $rates[$i]['rate'] = 0;
         }
 }
 
-    return apply_filters( 'getpaid_filter_item_tax_rates', $rates, $item );
+    return apply_filters('getpaid_filter_item_tax_rates', $rates, $item);
 }
 
 /**
@@ -242,12 +242,12 @@ 
  * @param array $rates
  * @return array
  */
-function getpaid_calculate_item_taxes( $amount, $rates ) {
+function getpaid_calculate_item_taxes($amount, $rates) {
 
     $is_inclusive = wpinv_prices_include_tax();
-    $taxes        = GetPaid_Tax::calc_tax( $amount, $rates, $is_inclusive );
+    $taxes        = GetPaid_Tax::calc_tax($amount, $rates, $is_inclusive);
 
-    return apply_filters( 'getpaid_calculate_taxes', $taxes, $amount, $rates );
+    return apply_filters('getpaid_calculate_taxes', $taxes, $amount, $rates);
 }
 
 /**
@@ -259,17 +259,17 @@ 
  * @param float $recurring_tax_amount
  * @return array
  */
-function getpaid_prepare_item_tax( $item, $tax_name, $tax_amount, $recurring_tax_amount ) {
+function getpaid_prepare_item_tax($item, $tax_name, $tax_amount, $recurring_tax_amount) {
 
-    $initial_tax   = $tax_amount;
+    $initial_tax = $tax_amount;
 	$recurring_tax = 0;
 
-    if ( $item->is_recurring() ) {
+    if ($item->is_recurring()) {
 		$recurring_tax = $recurring_tax_amount;
 	}
 
 	return array(
-		'name'          => sanitize_text_field( $tax_name ),
+		'name'          => sanitize_text_field($tax_name),
 		'initial_tax'   => $initial_tax,
 		'recurring_tax' => $recurring_tax,
     );
@@ -282,8 +282,8 @@ 
  * @param string $vat_number
  * @return string
  */
-function wpinv_sanitize_vat_number( $vat_number ) {
-    return str_replace( array( ' ', '.', '-', '_', ',' ), '', strtoupper( trim( $vat_number ) ) );
+function wpinv_sanitize_vat_number($vat_number) {
+    return str_replace(array(' ', '.', '-', '_', ','), '', strtoupper(trim($vat_number)));
 }
 
 /**
@@ -292,22 +292,22 @@ 
  * @param string $vat_number
  * @return bool
  */
-function wpinv_regex_validate_vat_number( $vat_number ) {
+function wpinv_regex_validate_vat_number($vat_number) {
 
-    $country    = substr( $vat_number, 0, 2 );
-    $vatin      = substr( $vat_number, 2 );
-    $regexes    = wpinv_get_data( 'vat-number-regexes' );
+    $country    = substr($vat_number, 0, 2);
+    $vatin      = substr($vat_number, 2);
+    $regexes    = wpinv_get_data('vat-number-regexes');
 
-    if ( isset( $regexes[ $country ] ) ) {
+    if (isset($regexes[$country])) {
 
-        $regex = $regexes[ $country ];
+        $regex = $regexes[$country];
         $regex = '/^(?:' . $regex . ')$/';
-        return 1 === preg_match( $regex, $vatin );
+        return 1 === preg_match($regex, $vatin);
 
     }
 
     // Not an EU state, use filters to validate the number.
-    return apply_filters( 'wpinv_regex_validate_vat_number', true, $vat_number );
+    return apply_filters('wpinv_regex_validate_vat_number', true, $vat_number);
 }
 
 /**
@@ -316,29 +316,29 @@ 
  * @param string $vat_number
  * @return bool
  */
-function wpinv_vies_validate_vat_number( $vat_number ) {
+function wpinv_vies_validate_vat_number($vat_number) {
 
-    $country    = substr( $vat_number, 0, 2 );
-    $vatin      = substr( $vat_number, 2 );
+    $country    = substr($vat_number, 0, 2);
+    $vatin      = substr($vat_number, 2);
 
     $url        = add_query_arg(
         array(
-            'ms'  => urlencode( $country ),
-            'iso' => urlencode( $country ),
-            'vat' => urlencode( $vatin ),
+            'ms'  => urlencode($country),
+            'iso' => urlencode($country),
+            'vat' => urlencode($vatin),
         ),
         'http://ec.europa.eu/taxation_customs/vies/viesquer.do'
     );
 
-    $response   = wp_remote_get( $url );
-    $response   = wp_remote_retrieve_body( $response );
+    $response   = wp_remote_get($url);
+    $response   = wp_remote_retrieve_body($response);
 
     // Fallback gracefully if the VIES website is down.
-    if ( empty( $response ) ) {
+    if (empty($response)) {
         return true;
     }
 
-    return 1 !== preg_match( '/invalid VAT number/i', $response );
+    return 1 !== preg_match('/invalid VAT number/i', $response);
 
 }
 
@@ -349,18 +349,18 @@ 
  * @param string $country
  * @return bool
  */
-function wpinv_validate_vat_number( $vat_number, $country ) {
+function wpinv_validate_vat_number($vat_number, $country) {
 
     // In case the vat number does not have a country code...
-    $vat_number = wpinv_sanitize_vat_number( $vat_number );
-    $_country   = substr( $vat_number, 0, 2 );
-    $_country   = $_country == wpinv_country_name( $_country );
+    $vat_number = wpinv_sanitize_vat_number($vat_number);
+    $_country   = substr($vat_number, 0, 2);
+    $_country   = $_country == wpinv_country_name($_country);
 
-    if ( $_country ) {
-        $vat_number = strtoupper( $country ) . $vat_number;
+    if ($_country) {
+        $vat_number = strtoupper($country) . $vat_number;
     }
 
-    return wpinv_regex_validate_vat_number( $vat_number ) && wpinv_vies_validate_vat_number( $vat_number );
+    return wpinv_regex_validate_vat_number($vat_number) && wpinv_vies_validate_vat_number($vat_number);
 }
 
 /**
@@ -369,39 +369,39 @@ 
  * @return bool
  */
 function wpinv_should_validate_vat_number() {
-    $validate = wpinv_get_option( 'validate_vat_number' );
-	return ! empty( $validate );
+    $validate = wpinv_get_option('validate_vat_number');
+	return !empty($validate);
 }
 
-function wpinv_sales_tax_for_year( $year = null ) {
-    return wpinv_price( wpinv_get_sales_tax_for_year( $year ) );
+function wpinv_sales_tax_for_year($year = null) {
+    return wpinv_price(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() {
@@ -410,34 +410,34 @@ 
 
 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':
@@ -446,13 +446,13 @@ 
             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);
 }
 
 /**
@@ -460,25 +460,25 @@ 
  *
  * @param string|bool|null $vat_rule
  */
-function getpaid_filter_vat_rule( $vat_rule ) {
+function getpaid_filter_vat_rule($vat_rule) {
 
-    if ( empty( $vat_rule ) ) {
+    if (empty($vat_rule)) {
         return 'digital';
     }
 
     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' );
+add_filter('wpinv_get_item_vat_class', 'getpaid_filter_vat_class');
 
 /**
  * Returns a list of all tax classes.
@@ -490,9 +490,9 @@ 
     return apply_filters(
         'getpaid_tax_classes',
         array(
-            '_standard' => __( 'Standard Tax Rate', 'invoicing' ),
-            '_reduced'  => __( 'Reduced Tax Rate', 'invoicing' ),
-            '_exempt'   => __( 'Tax Exempt', 'invoicing' ),
+            '_standard' => __('Standard Tax Rate', 'invoicing'),
+            '_reduced'  => __('Reduced Tax Rate', 'invoicing'),
+            '_exempt'   => __('Tax Exempt', 'invoicing'),
         )
     );
 
@@ -503,8 +503,8 @@ 
  *
  * @return array
  */
-function getpaid_get_tax_rules( $return = 'label' ) {
-    return wp_list_pluck( GetPaid_Tax::get_all_tax_rules(), $return, 'key' );
+function getpaid_get_tax_rules($return = 'label') {
+    return wp_list_pluck(GetPaid_Tax::get_all_tax_rules(), $return, 'key');
 }
 
 /**
@@ -513,15 +513,15 @@ 
  * @param string $tax_class
  * @return string
  */
-function getpaid_get_tax_class_label( $tax_class ) {
+function getpaid_get_tax_class_label($tax_class) {
 
     $classes = getpaid_get_tax_classes();
 
-    if ( isset( $classes[ $tax_class ] ) ) {
-        return sanitize_text_field( $classes[ $tax_class ] );
+    if (isset($classes[$tax_class])) {
+        return sanitize_text_field($classes[$tax_class]);
     }
 
-    return sanitize_text_field( $tax_class );
+    return sanitize_text_field($tax_class);
 
 }
 
@@ -531,15 +531,15 @@ 
  * @param string $tax_rule
  * @return string
  */
-function getpaid_get_tax_rule_label( $tax_rule ) {
+function getpaid_get_tax_rule_label($tax_rule) {
 
     $rules = getpaid_get_tax_rules();
 
-    if ( isset( $rules[ $tax_rule ] ) ) {
-        return sanitize_text_field( $rules[ $tax_rule ] );
+    if (isset($rules[$tax_rule])) {
+        return sanitize_text_field($rules[$tax_rule]);
     }
 
-    return sanitize_text_field( $tax_rule );
+    return sanitize_text_field($tax_rule);
 
 }
 
@@ -550,11 +550,11 @@ 
  * @param string $recurring
  * @return string
  */
-function getpaid_get_taxable_amount( $item, $recurring = false ) {
+function getpaid_get_taxable_amount($item, $recurring = false) {
 
     $taxable_amount  = $recurring ? $item->get_recurring_sub_total() : $item->get_sub_total();
     $taxable_amount -= $recurring ? $item->recurring_item_discount : $item->item_discount;
-    $taxable_amount  = max( 0, $taxable_amount );
-    return apply_filters( 'getpaid_taxable_amount', $taxable_amount, $item, $recurring );
+    $taxable_amount  = max(0, $taxable_amount);
+    return apply_filters('getpaid_taxable_amount', $taxable_amount, $item, $recurring);
 
 }

includes/data/admin-settings.php

Spacing +174 added lines, -174 removed lines

@@ -8,40 +8,40 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $getpaid_pages = GetPaid_Installer::get_pages();
-$pages         = wpinv_get_pages( true );
+$pages         = wpinv_get_pages(true);
 
 $currencies = wpinv_get_currencies();
 
 $currency_code_options = array();
-foreach ( $currencies as $code => $name ) {
-    $currency_code_options[ $code ] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol( $code ) . ')';
+foreach ($currencies as $code => $name) {
+    $currency_code_options[$code] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol($code) . ')';
 }
 
 $invoice_number_padd_options = array();
-for ( $i = 0; $i <= 20; $i++ ) {
-    $invoice_number_padd_options[ $i ] = $i;
+for ($i = 0; $i <= 20; $i++) {
+    $invoice_number_padd_options[$i] = $i;
 }
 
 $currency_symbol = wpinv_currency_symbol();
 
 $last_number = $reset_number = '';
-if ( $last_invoice_number = get_option( 'wpinv_last_invoice_number' ) ) {
-    $last_invoice_number = preg_replace( '/[^0-9]/', '', $last_invoice_number );
+if ($last_invoice_number = get_option('wpinv_last_invoice_number')) {
+    $last_invoice_number = preg_replace('/[^0-9]/', '', $last_invoice_number);
 
-    if ( ! empty( $last_invoice_number ) ) {
-        $last_number = ' ' . wp_sprintf( __( "( Last Invoice's sequential number: <b>%s</b> )", 'invoicing' ), $last_invoice_number );
+    if (!empty($last_invoice_number)) {
+        $last_number = ' ' . wp_sprintf(__("( Last Invoice's sequential number: <b>%s</b> )", 'invoicing'), $last_invoice_number);
     }
 
-    $nonce = wp_create_nonce( 'reset_invoice_count' );
+    $nonce = wp_create_nonce('reset_invoice_count');
     $reset_number = '<a href="' . add_query_arg(
         array(
 			'reset_invoice_count' => 1,
 			'_nonce'              => $nonce,
         )
-    ) . '" class="btn button">' . __( 'Force Reset Sequence', 'invoicing' ) . '</a>';
+    ) . '" class="btn button">' . __('Force Reset Sequence', 'invoicing') . '</a>';
 }
 
 $alert_wrapper_start = '<p style="color: #F00">';
@@ -54,59 +54,59 @@ 
             'main'             => array(
                 'location_settings' => array(
                     'id'   => 'location_settings',
-                    'name' => '<h3>' . __( 'Default Location', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Default Location', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'default_country'   => array(
                     'id'          => 'default_country',
-                    'name'        => __( 'Default Country', 'invoicing' ),
-                    'desc'        => __( 'Where does your store operate from?', 'invoicing' ),
+                    'name'        => __('Default Country', 'invoicing'),
+                    'desc'        => __('Where does your store operate from?', 'invoicing'),
                     'type'        => 'select',
                     'options'     => wpinv_get_country_list(),
                     'std'         => 'GB',
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a country', 'invoicing' ),
+                    'placeholder' => __('Select a country', 'invoicing'),
                 ),
                 'default_state'     => array(
                     'id'          => 'default_state',
-                    'name'        => __( 'Default State / Province', 'invoicing' ),
-                    'desc'        => __( 'What state / province does your store operate from?', 'invoicing' ),
+                    'name'        => __('Default State / Province', 'invoicing'),
+                    'desc'        => __('What state / province does your store operate from?', 'invoicing'),
                     'type'        => 'country_states',
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a state', 'invoicing' ),
+                    'placeholder' => __('Select a state', 'invoicing'),
                 ),
                 'store_name'        => array(
                     'id'   => 'store_name',
-                    'name' => __( 'Store Name', 'invoicing' ),
-                    'desc' => __( 'Store name to print on invoices.', 'invoicing' ),
-                    'std'  => get_option( 'blogname' ),
+                    'name' => __('Store Name', 'invoicing'),
+                    'desc' => __('Store name to print on invoices.', 'invoicing'),
+                    'std'  => get_option('blogname'),
                     'type' => 'text',
                 ),
                 'logo'              => array(
                     'id'   => 'logo',
-                    'name' => __( 'Logo URL', 'invoicing' ),
-                    'desc' => __( 'Store logo to print on invoices.', 'invoicing' ),
+                    'name' => __('Logo URL', 'invoicing'),
+                    'desc' => __('Store logo to print on invoices.', 'invoicing'),
                     'type' => 'text',
                 ),
                 'logo_width'        => array(
                     'id'          => 'logo_width',
-                    'name'        => __( 'Logo width', 'invoicing' ),
-                    'desc'        => __( 'Logo width to use in invoice image.', 'invoicing' ),
+                    'name'        => __('Logo width', 'invoicing'),
+                    'desc'        => __('Logo width to use in invoice image.', 'invoicing'),
                     'type'        => 'number',
-                    'placeholder' => __( 'Auto', 'invoicing' ),
+                    'placeholder' => __('Auto', 'invoicing'),
                 ),
                 'logo_height'       => array(
                     'id'          => 'logo_height',
-                    'name'        => __( 'Logo height', 'invoicing' ),
-                    'desc'        => __( 'Logo height to use in invoice image.', 'invoicing' ),
+                    'name'        => __('Logo height', 'invoicing'),
+                    'desc'        => __('Logo height to use in invoice image.', 'invoicing'),
                     'type'        => 'number',
-                    'placeholder' => __( 'Auto', 'invoicing' ),
+                    'placeholder' => __('Auto', 'invoicing'),
                 ),
                 'store_address'     => array(
                     'id'   => 'store_address',
-                    'name' => __( 'Store Address', 'invoicing' ),
-                    'desc' => __( 'Enter the store address to display on invoice', 'invoicing' ),
+                    'name' => __('Store Address', 'invoicing'),
+                    'desc' => __('Enter the store address to display on invoice', 'invoicing'),
                     'type' => 'textarea',
                 ),
 
@@ -114,114 +114,114 @@ 
             'page_section'     => array(
                 'page_settings'             => array(
                     'id'   => 'page_settings',
-                    'name' => '<h3>' . __( 'Page Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Page Settings', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'checkout_page'             => array(
                     'id'              => 'checkout_page',
-                    'name'            => __( 'Checkout Page', 'invoicing' ),
-                    'desc'            => __( 'This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing' ),
+                    'name'            => __('Checkout Page', 'invoicing'),
+                    'desc'            => __('This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing'),
                     'type'            => 'select',
                     'options'         => $pages,
                     'class'           => 'wpi_select2',
-                    'placeholder'     => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['checkout_page'] ) ? '' : $getpaid_pages['checkout_page']['content'],
+                    'placeholder'     => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['checkout_page']) ? '' : $getpaid_pages['checkout_page']['content'],
                     'help-tip'        => true,
                 ),
                 'success_page'              => array(
                     'id'              => 'success_page',
-                    'name'            => __( 'Success Page', 'invoicing' ),
-                    'desc'            => __( 'This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing' ),
+                    'name'            => __('Success Page', 'invoicing'),
+                    'desc'            => __('This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing'),
                     'type'            => 'select',
                     'options'         => $pages,
                     'class'           => 'wpi_select2',
-                    'placeholder'     => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['success_page'] ) ? '' : $getpaid_pages['success_page']['content'],
+                    'placeholder'     => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['success_page']) ? '' : $getpaid_pages['success_page']['content'],
                     'help-tip'        => true,
                 ),
                 'failure_page'              => array(
                     'id'              => 'failure_page',
-                    'name'            => __( 'Failed Transaction Page', 'invoicing' ),
-                    'desc'            => __( 'This is the page buyers are sent to if their transaction is cancelled or fails.', 'invoicing' ),
+                    'name'            => __('Failed Transaction Page', 'invoicing'),
+                    'desc'            => __('This is the page buyers are sent to if their transaction is cancelled or fails.', 'invoicing'),
                     'type'            => 'select',
                     'options'         => $pages,
                     'class'           => 'wpi_select2',
-                    'placeholder'     => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['failure_page'] ) ? '' : $getpaid_pages['failure_page']['content'],
+                    'placeholder'     => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['failure_page']) ? '' : $getpaid_pages['failure_page']['content'],
                     'help-tip'        => true,
                 ),
                 'invoice_history_page'      => array(
                     'id'              => 'invoice_history_page',
-                    'name'            => __( 'Invoice History Page', 'invoicing' ),
-                    'desc'            => __( 'This page shows an invoice history for the current user. The <b>[wpinv_history]</b> short code should be on this page.', 'invoicing' ),
+                    'name'            => __('Invoice History Page', 'invoicing'),
+                    'desc'            => __('This page shows an invoice history for the current user. The <b>[wpinv_history]</b> short code should be on this page.', 'invoicing'),
                     'type'            => 'select',
                     'options'         => $pages,
                     'class'           => 'wpi_select2',
-                    'placeholder'     => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['invoice_history_page'] ) ? '' : $getpaid_pages['invoice_history_page']['content'],
+                    'placeholder'     => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['invoice_history_page']) ? '' : $getpaid_pages['invoice_history_page']['content'],
                     'help-tip'        => true,
                 ),
                 'invoice_subscription_page' => array(
                     'id'              => 'invoice_subscription_page',
-                    'name'            => __( 'Invoice Subscriptions Page', 'invoicing' ),
-                    'desc'            => __( 'This page shows subscriptions history for the current user. The <b>[wpinv_subscriptions]</b> short code should be on this page.', 'invoicing' ),
+                    'name'            => __('Invoice Subscriptions Page', 'invoicing'),
+                    'desc'            => __('This page shows subscriptions history for the current user. The <b>[wpinv_subscriptions]</b> short code should be on this page.', 'invoicing'),
                     'type'            => 'select',
                     'options'         => $pages,
                     'class'           => 'wpi_select2',
-                    'placeholder'     => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['invoice_subscription_page'] ) ? '' : $getpaid_pages['invoice_subscription_page']['content'],
+                    'placeholder'     => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['invoice_subscription_page']) ? '' : $getpaid_pages['invoice_subscription_page']['content'],
                     'help-tip'        => true,
                 ),
             ),
             'currency_section' => array(
                 'currency_settings'   => array(
                     'id'   => 'currency_settings',
-                    'name' => '<h3>' . __( 'Currency Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Currency Settings', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'currency'            => array(
                     'id'      => 'currency',
-                    'name'    => __( 'Currency', 'invoicing' ),
-                    'desc'    => __( 'Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing' ),
+                    'name'    => __('Currency', 'invoicing'),
+                    'desc'    => __('Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing'),
                     'type'    => 'select',
                     'class'   => 'wpi_select2',
                     'options' => $currency_code_options,
                 ),
                 'currency_position'   => array(
                     'id'      => 'currency_position',
-                    'name'    => __( 'Currency Position', 'invoicing' ),
-                    'desc'    => __( 'Choose the location of the currency sign.', 'invoicing' ),
+                    'name'    => __('Currency Position', 'invoicing'),
+                    'desc'    => __('Choose the location of the currency sign.', 'invoicing'),
                     'type'    => 'select',
                     'class'   => 'wpi_select2',
                     'options' => array(
-                        'left'        => __( 'Left', 'invoicing' ) . ' (' . $currency_symbol . wpinv_format_amount( '99.99' ) . ')',
-                        'right'       => __( 'Right', 'invoicing' ) . ' (' . wpinv_format_amount( '99.99' ) . $currency_symbol . ')',
-                        'left_space'  => __( 'Left with space', 'invoicing' ) . ' (' . $currency_symbol . ' ' . wpinv_format_amount( '99.99' ) . ')',
-                        'right_space' => __( 'Right with space', 'invoicing' ) . ' (' . wpinv_format_amount( '99.99' ) . ' ' . $currency_symbol . ')',
+                        'left'        => __('Left', 'invoicing') . ' (' . $currency_symbol . wpinv_format_amount('99.99') . ')',
+                        'right'       => __('Right', 'invoicing') . ' (' . wpinv_format_amount('99.99') . $currency_symbol . ')',
+                        'left_space'  => __('Left with space', 'invoicing') . ' (' . $currency_symbol . ' ' . wpinv_format_amount('99.99') . ')',
+                        'right_space' => __('Right with space', 'invoicing') . ' (' . wpinv_format_amount('99.99') . ' ' . $currency_symbol . ')',
                     ),
                 ),
                 'thousands_separator' => array(
                     'id'   => 'thousands_separator',
-                    'name' => __( 'Thousands Separator', 'invoicing' ),
-                    'desc' => __( 'The symbol (usually , or .) to separate thousands', 'invoicing' ),
+                    'name' => __('Thousands Separator', 'invoicing'),
+                    'desc' => __('The symbol (usually , or .) to separate thousands', 'invoicing'),
                     'type' => 'text',
                     'size' => 'small',
                     'std'  => ',',
                 ),
                 'decimal_separator'   => array(
                     'id'   => 'decimal_separator',
-                    'name' => __( 'Decimal Separator', 'invoicing' ),
-                    'desc' => __( 'The symbol (usually , or .) to separate decimal points', 'invoicing' ),
+                    'name' => __('Decimal Separator', 'invoicing'),
+                    'desc' => __('The symbol (usually , or .) to separate decimal points', 'invoicing'),
                     'type' => 'text',
                     'size' => 'small',
                     'std'  => '.',
                 ),
                 'decimals'            => array(
                     'id'   => 'decimals',
-                    'name' => __( 'Number of Decimals', 'invoicing' ),
-                    'desc' => __( 'This sets the number of decimal points shown in displayed prices.', 'invoicing' ),
+                    'name' => __('Number of Decimals', 'invoicing'),
+                    'desc' => __('This sets the number of decimal points shown in displayed prices.', 'invoicing'),
                     'type' => 'number',
                     'size' => 'small',
                     'std'  => '2',
@@ -233,21 +233,21 @@ 
             'labels'           => array(
                 'labels'                   => array(
                     'id'   => 'labels_settings',
-                    'name' => '<h3>' . __( 'Invoice Labels', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Invoice Labels', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'vat_invoice_notice_label' => array(
                     'id'   => 'vat_invoice_notice_label',
-                    'name' => __( 'Invoice Notice Label', 'invoicing' ),
-                    'desc' => __( 'Use this to add an invoice notice section (label) to your invoices', 'invoicing' ),
+                    'name' => __('Invoice Notice Label', 'invoicing'),
+                    'desc' => __('Use this to add an invoice notice section (label) to your invoices', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
                 'vat_invoice_notice'       => array(
                     'id'   => 'vat_invoice_notice',
-                    'name' => __( 'Invoice notice', 'invoicing' ),
-                    'desc' => __( 'Use this to add an invoice notice section (description) to your invoices', 'invoicing' ),
+                    'name' => __('Invoice notice', 'invoicing'),
+                    'desc' => __('Use this to add an invoice notice section (description) to your invoices', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
@@ -260,22 +260,22 @@ 
             'main' => array(
                 'gateway_settings' => array(
                     'id'   => 'api_header',
-                    'name' => '<h3>' . __( 'Gateway Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Gateway Settings', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'gateways'         => array(
                     'id'      => 'gateways',
-                    'name'    => __( 'Payment Gateways', 'invoicing' ),
-                    'desc'    => __( 'Choose the payment gateways you want to enable.', 'invoicing' ),
+                    'name'    => __('Payment Gateways', 'invoicing'),
+                    'desc'    => __('Choose the payment gateways you want to enable.', 'invoicing'),
                     'type'    => 'gateways',
-                    'std'     => array( 'manual' => 1 ),
+                    'std'     => array('manual' => 1),
                     'options' => wpinv_get_payment_gateways(),
                 ),
                 'default_gateway'  => array(
                     'id'      => 'default_gateway',
-                    'name'    => __( 'Default Gateway', 'invoicing' ),
-                    'desc'    => __( 'This gateway will be loaded automatically with the checkout page.', 'invoicing' ),
+                    'name'    => __('Default Gateway', 'invoicing'),
+                    'desc'    => __('This gateway will be loaded automatically with the checkout page.', 'invoicing'),
                     'type'    => 'gateway_select',
                     'std'     => 'manual',
                     'class'   => 'wpi_select2',
@@ -291,32 +291,32 @@ 
             'main'  => array(
                 'tax_settings'          => array(
                     'id'   => 'tax_settings',
-                    'name' => '<h3>' . __( 'Tax Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Tax Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_taxes'          => array(
                     'id'   => 'enable_taxes',
-                    'name' => __( 'Enable Taxes', 'invoicing' ),
-                    'desc' => __( 'Enable tax rates and calculations.', 'invoicing' ),
+                    'name' => __('Enable Taxes', 'invoicing'),
+                    'desc' => __('Enable tax rates and calculations.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => 0,
                 ),
 
                 'tax_subtotal_rounding' => array(
                     'id'   => 'tax_subtotal_rounding',
-                    'name' => __( 'Rounding', 'invoicing' ),
-                    'desc' => __( 'Round tax at subtotal level, instead of rounding per tax rate', 'invoicing' ),
+                    'name' => __('Rounding', 'invoicing'),
+                    'desc' => __('Round tax at subtotal level, instead of rounding per tax rate', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => 1,
                 ),
 
                 'prices_include_tax'    => array(
                     'id'      => 'prices_include_tax',
-                    'name'    => __( 'Prices entered with tax', 'invoicing' ),
+                    'name'    => __('Prices entered with tax', 'invoicing'),
                     'options' => array(
-                        'yes' => __( 'Yes, I will enter prices inclusive of tax', 'invoicing' ),
-                        'no'  => __( 'No, I will enter prices exclusive of tax', 'invoicing' ),
+                        'yes' => __('Yes, I will enter prices inclusive of tax', 'invoicing'),
+                        'no'  => __('No, I will enter prices exclusive of tax', 'invoicing'),
                     ),
                     'type'    => 'select',
                     'std'     => 'no',
@@ -324,10 +324,10 @@ 
 
                 'tax_base'              => array(
                     'id'      => 'tax_base',
-                    'name'    => __( 'Calculate tax based on', 'invoicing' ),
+                    'name'    => __('Calculate tax based on', 'invoicing'),
                     'options' => array(
-                        'billing' => __( 'Customer billing address', 'invoicing' ),
-                        'base'    => __( 'Shop base address', 'invoicing' ),
+                        'billing' => __('Customer billing address', 'invoicing'),
+                        'base'    => __('Shop base address', 'invoicing'),
                     ),
                     'type'    => 'select',
                     'std'     => 'billing',
@@ -335,24 +335,24 @@ 
 
                 'vat_same_country_rule'    => array(
                     'id'          => 'vat_same_country_rule',
-                    'name'        => __( 'Same country rule', 'invoicing' ),
-                    'desc'        => __( 'What should happen if a customer is from the same country as your business?', 'invoicing' ),
+                    'name'        => __('Same country rule', 'invoicing'),
+                    'desc'        => __('What should happen if a customer is from the same country as your business?', 'invoicing'),
                     'type'        => 'select',
                     'options'     => array(
-                        'no'      => __( 'Do not charge tax', 'invoicing' ),
-                        'always'  => __( 'Charge tax unless vat number is validated', 'invoicing' ),
-                        'vat_too' => __( 'Charge tax even if vat number is validated', 'invoicing' ),
+                        'no'      => __('Do not charge tax', 'invoicing'),
+                        'always'  => __('Charge tax unless vat number is validated', 'invoicing'),
+                        'vat_too' => __('Charge tax even if vat number is validated', 'invoicing'),
                     ),
-                    'placeholder' => __( 'Select an option', 'invoicing' ),
+                    'placeholder' => __('Select an option', 'invoicing'),
                     'std'         => 'vat_too',
                 ),
 
                 'tax_display_totals'    => array(
                     'id'      => 'tax_display_totals',
-                    'name'    => __( 'Display tax totals', 'invoicing' ),
+                    'name'    => __('Display tax totals', 'invoicing'),
                     'options' => array(
-                        'single'     => __( 'As a single total', 'invoicing' ),
-                        'individual' => __( 'As individual tax rates', 'invoicing' ),
+                        'single'     => __('As a single total', 'invoicing'),
+                        'individual' => __('As individual tax rates', 'invoicing'),
                     ),
                     'type'    => 'select',
                     'std'     => 'individual',
@@ -360,8 +360,8 @@ 
 
                 'tax_rate'              => array(
                     'id'   => 'tax_rate',
-                    'name' => __( 'Fallback Tax Rate', 'invoicing' ),
-                    'desc' => __( 'Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing' ),
+                    'name' => __('Fallback Tax Rate', 'invoicing'),
+                    'desc' => __('Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing'),
                     'type' => 'number',
                     'size' => 'small',
                     'min'  => '0',
@@ -373,8 +373,8 @@ 
             'rules' => array(
                 'tax_rules' => array(
                     'id'   => 'tax_rules',
-                    'name' => '<h3>' . __( 'Tax Rules', 'invoicing' ) . '</h3>',
-                    'desc' => __( 'Create/Update tax rules', 'invoicing' ),
+                    'name' => '<h3>' . __('Tax Rules', 'invoicing') . '</h3>',
+                    'desc' => __('Create/Update tax rules', 'invoicing'),
                     'type' => 'tax_rules',
                 ),
             ),
@@ -382,8 +382,8 @@ 
             'rates' => array(
                 'tax_rates' => array(
                     'id'   => 'tax_rates',
-                    'name' => '<h3>' . __( 'Tax Rates', 'invoicing' ) . '</h3>',
-                    'desc' => __( 'Enter tax rates for specific regions.', 'invoicing' ),
+                    'name' => '<h3>' . __('Tax Rates', 'invoicing') . '</h3>',
+                    'desc' => __('Enter tax rates for specific regions.', 'invoicing'),
                     'type' => 'tax_rates',
                 ),
             ),
@@ -392,31 +392,31 @@ 
 
                 'vat_company_name'         => array(
                     'id'   => 'vat_company_name',
-                    'name' => __( 'Company Name', 'invoicing' ),
-                    'desc' => wp_sprintf( __( 'Verify your company name and  VAT number on the %1$sEU VIES System.%2$s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                    'name' => __('Company Name', 'invoicing'),
+                    'desc' => wp_sprintf(__('Verify your company name and  VAT number on the %1$sEU VIES System.%2$s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
 
                 'vat_number'               => array(
                     'id'   => 'vat_number',
-                    'name' => __( 'VAT Number', 'invoicing' ),
-                    'desc' => __( 'Enter your VAT number including the country identifier, eg: GB123456789', 'invoicing' ),
+                    'name' => __('VAT Number', 'invoicing'),
+                    'desc' => __('Enter your VAT number including the country identifier, eg: GB123456789', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
 
                 'vat_prevent_b2c_purchase' => array(
                     'id'   => 'vat_prevent_b2c_purchase',
-                    'name' => __( 'Prevent B2C Sales', 'invoicing' ),
-                    'desc' => __( 'Require everyone in the EU to provide a VAT number.', 'invoicing' ),
+                    'name' => __('Prevent B2C Sales', 'invoicing'),
+                    'desc' => __('Require everyone in the EU to provide a VAT number.', 'invoicing'),
                     'type' => 'checkbox',
                 ),
 
                 'validate_vat_number'      => array(
                     'id'   => 'validate_vat_number',
-                    'name' => __( 'Validate VAT Number', 'invoicing' ),
-                    'desc' => __( 'Validate VAT numbers with VIES.', 'invoicing' ),
+                    'name' => __('Validate VAT Number', 'invoicing'),
+                    'desc' => __('Validate VAT numbers with VIES.', 'invoicing'),
                     'type' => 'checkbox',
                 ),
 
@@ -431,66 +431,66 @@ 
             'main' => array(
                 'email_settings_header'       => array(
                     'id'   => 'email_settings_header',
-                    'name' => '<h3>' . __( 'Email Sender Options', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Email Sender Options', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'email_from_name'             => array(
                     'id'   => 'email_from_name',
-                    'name' => __( 'From Name', 'invoicing' ),
-                    'desc' => __( 'Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing' ),
-                    'std'  => esc_attr( get_bloginfo( 'name', 'display' ) ),
+                    'name' => __('From Name', 'invoicing'),
+                    'desc' => __('Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing'),
+                    'std'  => esc_attr(get_bloginfo('name', 'display')),
                     'type' => 'text',
                 ),
                 'email_from'                  => array(
                     'id'   => 'email_from',
-                    'name' => __( 'From Email', 'invoicing' ),
-                    'desc' => sprintf( __( 'Email address to send invoice emails from. This will act as the "from" address. %1$s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%2$s', 'invoicing' ), $alert_wrapper_start, $alert_wrapper_close ),
-                    'std'  => get_option( 'admin_email' ),
+                    'name' => __('From Email', 'invoicing'),
+                    'desc' => sprintf(__('Email address to send invoice emails from. This will act as the "from" address. %1$s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%2$s', 'invoicing'), $alert_wrapper_start, $alert_wrapper_close),
+                    'std'  => get_option('admin_email'),
                     'type' => 'text',
                 ),
                 'admin_email'                 => array(
                     'id'   => 'admin_email',
-                    'name' => __( 'Admin Email', 'invoicing' ),
-                    'desc' => __( 'Where should we send admin notifications? This will is also act as the "reply-to" address for invoice emails', 'invoicing' ),
-                    'std'  => get_option( 'admin_email' ),
+                    'name' => __('Admin Email', 'invoicing'),
+                    'desc' => __('Where should we send admin notifications? This will is also act as the "reply-to" address for invoice emails', 'invoicing'),
+                    'std'  => get_option('admin_email'),
                     'type' => 'text',
                 ),
                 'skip_email_free_invoice'     => array(
                     'id'   => 'skip_email_free_invoice',
-                    'name' => __( 'Skip Free Invoices', 'invoicing' ),
-                    'desc' => __( 'Check this to disable sending emails for free invoices.', 'invoicing' ),
+                    'name' => __('Skip Free Invoices', 'invoicing'),
+                    'desc' => __('Check this to disable sending emails for free invoices.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => false,
                 ),
                 'overdue_settings_header'     => array(
                     'id'   => 'overdue_settings_header',
-                    'name' => '<h3>' . __( 'Due Date Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Due Date Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'overdue_active'              => array(
                     'id'   => 'overdue_active',
-                    'name' => __( 'Enable Due Date', 'invoicing' ),
-                    'desc' => __( 'Check this to enable due date option for invoices.', 'invoicing' ),
+                    'name' => __('Enable Due Date', 'invoicing'),
+                    'desc' => __('Check this to enable due date option for invoices.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => false,
                 ),
                 'email_template_header'       => array(
                     'id'   => 'email_template_header',
-                    'name' => '<h3>' . __( 'Email Template', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Email Template', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'email_header_image'          => array(
                     'id'   => 'email_header_image',
-                    'name' => __( 'Header Image', 'invoicing' ),
-                    'desc' => __( 'URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing' ),
+                    'name' => __('Header Image', 'invoicing'),
+                    'desc' => __('URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing'),
                     'std'  => '',
                     'type' => 'text',
                 ),
                 'email_footer_text'           => array(
                     'id'    => 'email_footer_text',
-                    'name'  => __( 'Footer Text', 'invoicing' ),
-                    'desc'  => __( 'The text to appear in the footer of all invoice emails.', 'invoicing' ),
-                    'std'   => get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ),
+                    'name'  => __('Footer Text', 'invoicing'),
+                    'desc'  => __('The text to appear in the footer of all invoice emails.', 'invoicing'),
+                    'std'   => get_bloginfo('name', 'display') . ' - ' . __('Powered by GetPaid', 'invoicing'),
                     'type'  => 'textarea',
                     'class' => 'regular-text',
                     'rows'  => 2,
@@ -498,29 +498,29 @@ 
                 ),
                 'email_base_color'            => array(
                     'id'   => 'email_base_color',
-                    'name' => __( 'Base Color', 'invoicing' ),
-                    'desc' => __( 'The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing' ),
+                    'name' => __('Base Color', 'invoicing'),
+                    'desc' => __('The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing'),
                     'std'  => '#557da2',
                     'type' => 'color',
                 ),
                 'email_background_color'      => array(
                     'id'   => 'email_background_color',
-                    'name' => __( 'Background Color', 'invoicing' ),
-                    'desc' => __( 'The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing' ),
+                    'name' => __('Background Color', 'invoicing'),
+                    'desc' => __('The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing'),
                     'std'  => '#f5f5f5',
                     'type' => 'color',
                 ),
                 'email_body_background_color' => array(
                     'id'   => 'email_body_background_color',
-                    'name' => __( 'Body Background Color', 'invoicing' ),
-                    'desc' => __( 'The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing' ),
+                    'name' => __('Body Background Color', 'invoicing'),
+                    'desc' => __('The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing'),
                     'std'  => '#fdfdfd',
                     'type' => 'color',
                 ),
                 'email_text_color'            => array(
                     'id'   => 'email_text_color',
-                    'name' => __( 'Body Text Color', 'invoicing' ),
-                    'desc' => __( 'The main body text color. Default <code>#505050</code>.', 'invoicing' ),
+                    'name' => __('Body Text Color', 'invoicing'),
+                    'desc' => __('The main body text color. Default <code>#505050</code>.', 'invoicing'),
                     'std'  => '#505050',
                     'type' => 'color',
                 ),
@@ -535,7 +535,7 @@ 
     ),
 
     // Integrations.
-    'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'settings', 'id' ),
+    'integrations' => wp_list_pluck(getpaid_get_integration_settings(), 'settings', 'id'),
 
     /** Privacy Settings */
     'privacy'      => apply_filters(
@@ -544,17 +544,17 @@ 
             'main' => array(
                 'invoicing_privacy_policy_settings' => array(
                     'id'   => 'invoicing_privacy_policy_settings',
-                    'name' => '<h3>' . __( 'Privacy Policy', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Privacy Policy', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'privacy_page'                      => array(
                     'id'          => 'privacy_page',
-                    'name'        => __( 'Privacy Page', 'invoicing' ),
-                    'desc'        => __( 'If no privacy policy page set in Settings->Privacy default settings, this page will be used on checkout page.', 'invoicing' ),
+                    'name'        => __('Privacy Page', 'invoicing'),
+                    'desc'        => __('If no privacy policy page set in Settings->Privacy default settings, this page will be used on checkout page.', 'invoicing'),
                     'type'        => 'select',
-                    'options'     => wpinv_get_pages( true, __( 'Select a page', 'invoicing' ) ),
+                    'options'     => wpinv_get_pages(true, __('Select a page', 'invoicing')),
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
+                    'placeholder' => __('Select a page', 'invoicing'),
                 ),
             ),
         )
@@ -566,19 +566,19 @@ 
             'main'       => array(
                 'invoice_number_format_settings' => array(
                     'id'   => 'invoice_number_format_settings',
-                    'name' => '<h3>' . __( 'Invoice Number', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Invoice Number', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'sequential_invoice_number'      => array(
                     'id'   => 'sequential_invoice_number',
-                    'name' => __( 'Sequential Invoice Numbers', 'invoicing' ),
-                    'desc' => __( 'Check this box to enable sequential invoice numbers.', 'invoicing' ) . $reset_number,
+                    'name' => __('Sequential Invoice Numbers', 'invoicing'),
+                    'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing') . $reset_number,
                     'type' => 'checkbox',
                 ),
                 'invoice_sequence_start'         => array(
                     'id'    => 'invoice_sequence_start',
-                    'name'  => __( 'Sequential Starting Number', 'invoicing' ),
-                    'desc'  => __( 'The number at which the invoice number sequence should begin.', 'invoicing' ) . $last_number,
+                    'name'  => __('Sequential Starting Number', 'invoicing'),
+                    'desc'  => __('The number at which the invoice number sequence should begin.', 'invoicing') . $last_number,
                     'type'  => 'number',
                     'size'  => 'small',
                     'std'   => '1',
@@ -586,8 +586,8 @@ 
                 ),
                 'invoice_number_padd'            => array(
                     'id'      => 'invoice_number_padd',
-                    'name'    => __( 'Minimum Digits', 'invoicing' ),
-                    'desc'    => __( 'If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing' ),
+                    'name'    => __('Minimum Digits', 'invoicing'),
+                    'desc'    => __('If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing'),
                     'type'    => 'select',
                     'options' => $invoice_number_padd_options,
                     'std'     => 5,
@@ -595,8 +595,8 @@ 
                 ),
                 'invoice_number_prefix'          => array(
                     'id'          => 'invoice_number_prefix',
-                    'name'        => __( 'Invoice Number Prefix', 'invoicing' ),
-                    'desc'        => __( 'Prefix for all invoice numbers. Ex: INV-', 'invoicing' ),
+                    'name'        => __('Invoice Number Prefix', 'invoicing'),
+                    'desc'        => __('Prefix for all invoice numbers. Ex: INV-', 'invoicing'),
                     'type'        => 'text',
                     'size'        => 'regular',
                     'std'         => 'INV-',
@@ -604,46 +604,46 @@ 
                 ),
                 'invoice_number_postfix'         => array(
                     'id'   => 'invoice_number_postfix',
-                    'name' => __( 'Invoice Number Postfix', 'invoicing' ),
-                    'desc' => __( 'Postfix for all invoice numbers.', 'invoicing' ),
+                    'name' => __('Invoice Number Postfix', 'invoicing'),
+                    'desc' => __('Postfix for all invoice numbers.', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                     'std'  => '',
                 ),
                 'checkout_settings'              => array(
                     'id'   => 'checkout_settings',
-                    'name' => '<h3>' . __( 'Checkout Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Checkout Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'disable_new_user_emails'        => array(
                     'id'   => 'disable_new_user_emails',
-                    'name' => __( 'Disable new user emails', 'invoicing' ),
-                    'desc' => __( 'Do not send an email to customers when a new user account is created for them.', 'invoicing' ),
+                    'name' => __('Disable new user emails', 'invoicing'),
+                    'desc' => __('Do not send an email to customers when a new user account is created for them.', 'invoicing'),
                     'type' => 'checkbox',
                 ),
                 'login_to_checkout'              => array(
                     'id'   => 'login_to_checkout',
-                    'name' => __( 'Require Login To Checkout', 'invoicing' ),
-                    'desc' => __( 'If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing' ),
+                    'name' => __('Require Login To Checkout', 'invoicing'),
+                    'desc' => __('If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing'),
                     'type' => 'checkbox',
                 ),
                 'maxmind_license_key'            => array(
                     'id'   => 'maxmind_license_key',
-                    'name' => __( 'MaxMind License Key', 'invoicing' ),
+                    'name' => __('MaxMind License Key', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
-                    'desc' => __( "Enter you license key if you would like to use MaxMind to automatically detect a customer's country.", 'invoicing' ) . ' <a href="https://support.maxmind.com/hc/en-us/articles/4407111582235-Generate-a-License-Key">' . __( 'How to generate a free license key.', 'invoicing' ) . '</a>',
+                    'desc' => __("Enter you license key if you would like to use MaxMind to automatically detect a customer's country.", 'invoicing') . ' <a href="https://support.maxmind.com/hc/en-us/articles/4407111582235-Generate-a-License-Key">' . __('How to generate a free license key.', 'invoicing') . '</a>',
                 ),
 
                 'uninstall_settings'             => array(
                     'id'   => 'uninstall_settings',
-                    'name' => '<h3>' . __( 'Uninstall Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Uninstall Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'remove_data_on_unistall'        => array(
                     'id'   => 'remove_data_on_unistall',
-                    'name' => __( 'Remove Data on Uninstall?', 'invoicing' ),
-                    'desc' => __( 'Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing' ),
+                    'name' => __('Remove Data on Uninstall?', 'invoicing'),
+                    'desc' => __('Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => '',
                 ),
@@ -652,13 +652,13 @@ 
             'custom-css' => array(
                 'css_settings'        => array(
                     'id'   => 'css_settings',
-                    'name' => '<h3>' . __( 'Custom CSS', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Custom CSS', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'template_custom_css' => array(
                     'id'    => 'template_custom_css',
-                    'name'  => __( 'Invoice Template CSS', 'invoicing' ),
-                    'desc'  => __( 'Add CSS to modify appearance of the print invoice page.', 'invoicing' ),
+                    'name'  => __('Invoice Template CSS', 'invoicing'),
+                    'desc'  => __('Add CSS to modify appearance of the print invoice page.', 'invoicing'),
                     'type'  => 'textarea',
                     'class' => 'regular-text',
                     'rows'  => 10,
@@ -673,8 +673,8 @@ 
             'main' => array(
                 'tool_settings' => array(
                     'id'   => 'tool_settings',
-                    'name' => '<h3>' . __( 'Diagnostic Tools', 'invoicing' ) . '</h3>',
-                    'desc' => __( 'Invoicing diagnostic tools', 'invoicing' ),
+                    'name' => '<h3>' . __('Diagnostic Tools', 'invoicing') . '</h3>',
+                    'desc' => __('Invoicing diagnostic tools', 'invoicing'),
                     'type' => 'tools',
                 ),
             ),

includes/admin/views/html-tax-rule-edit.php

Spacing +11 added lines, -11 removed lines

@@ -5,37 +5,37 @@
  * @var array $tax_rule
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <tr>
 
     <td class="wpinv-tax-rule-key">
-        <input type="text" name="tax_rules[<?php echo esc_attr( $tax_rule['key'] ); ?>][key]" value="<?php echo esc_attr( $tax_rule['key'] ); ?>" required/>
+        <input type="text" name="tax_rules[<?php echo esc_attr($tax_rule['key']); ?>][key]" value="<?php echo esc_attr($tax_rule['key']); ?>" required/>
     </td>
 
     <td class="wpinv-tax-rule-label">
-        <input type="text" name="tax_rules[<?php echo esc_attr( $tax_rule['key'] ); ?>][label]" value="<?php echo esc_attr( $tax_rule['label'] ); ?>" required/>
+        <input type="text" name="tax_rules[<?php echo esc_attr($tax_rule['key']); ?>][label]" value="<?php echo esc_attr($tax_rule['label']); ?>" required/>
     </td>
 
     <td class="wpinv-tax-rule-base-address">
-        <select name="tax_rules[<?php echo esc_attr( $tax_rule['key'] ); ?>][tax_base]" class="getpaid-tax-rule-base-address" required>
-            <option value="billing" <?php selected( $tax_rule['tax_base'], 'billing' ); ?>><?php esc_html_e( 'Customer billing address', 'invoicing' ); ?></option>
-            <option value="base" <?php selected( $tax_rule['tax_base'], 'base' ); ?>><?php esc_html_e( 'Shop base address', 'invoicing' ); ?></option>
+        <select name="tax_rules[<?php echo esc_attr($tax_rule['key']); ?>][tax_base]" class="getpaid-tax-rule-base-address" required>
+            <option value="billing" <?php selected($tax_rule['tax_base'], 'billing'); ?>><?php esc_html_e('Customer billing address', 'invoicing'); ?></option>
+            <option value="base" <?php selected($tax_rule['tax_base'], 'base'); ?>><?php esc_html_e('Shop base address', 'invoicing'); ?></option>
         </select>
     </td>
 
     <td class="wpinv-tax-rule-same-country">
-        <select name="tax_rules[<?php echo esc_attr( $tax_rule['key'] ); ?>][same_country_rule]" class="getpaid-tax-rule-same-country" required>
-            <option value="no" <?php selected( $tax_rule['same_country_rule'], 'no' ); ?>><?php esc_html_e( 'Do not charge tax', 'invoicing' ); ?></option>
-            <option value="always" <?php selected( $tax_rule['same_country_rule'], 'always' ); ?>><?php esc_html_e( 'Charge tax unless vat number is validated', 'invoicing' ); ?></option>
-            <option value="vat_too" <?php selected( $tax_rule['same_country_rule'], 'vat_too' ); ?>><?php esc_html_e( 'Charge tax even if vat number is validated', 'invoicing' ); ?></option>
+        <select name="tax_rules[<?php echo esc_attr($tax_rule['key']); ?>][same_country_rule]" class="getpaid-tax-rule-same-country" required>
+            <option value="no" <?php selected($tax_rule['same_country_rule'], 'no'); ?>><?php esc_html_e('Do not charge tax', 'invoicing'); ?></option>
+            <option value="always" <?php selected($tax_rule['same_country_rule'], 'always'); ?>><?php esc_html_e('Charge tax unless vat number is validated', 'invoicing'); ?></option>
+            <option value="vat_too" <?php selected($tax_rule['same_country_rule'], 'vat_too'); ?>><?php esc_html_e('Charge tax even if vat number is validated', 'invoicing'); ?></option>
         </select>
     </td>
 
     <td class="wpinv_tax_remove">
-        <button type="button" class="close wpinv_remove_tax_rule" aria-label="<?php esc_attr_e( 'Delete', 'invoicing' ); ?>" title="<?php esc_attr_e( 'Delete', 'invoicing' ); ?>">
+        <button type="button" class="close wpinv_remove_tax_rule" aria-label="<?php esc_attr_e('Delete', 'invoicing'); ?>" title="<?php esc_attr_e('Delete', 'invoicing'); ?>">
             <span aria-hidden="true">&times;</span>
         </button>
     </td>

includes/admin/views/html-tax-rules-edit.php

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 
 $dummy_rule = array(
     'key'               => 'TAX_RULE_KEY',
-	'label'             => __( 'New Tax Rule', 'invoicing' ),
-	'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+    'label'             => __( 'New Tax Rule', 'invoicing' ),
+    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
     'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
 );
 

Spacing +16 added lines, -16 removed lines

@@ -4,40 +4,40 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $dummy_rule = array(
     'key'               => 'TAX_RULE_KEY',
-	'label'             => __( 'New Tax Rule', 'invoicing' ),
-	'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+	'label'             => __('New Tax Rule', 'invoicing'),
+	'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+    'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 );
 
-wp_nonce_field( 'wpinv_tax_rules', 'wpinv_tax_rules_nonce' );
+wp_nonce_field('wpinv_tax_rules', 'wpinv_tax_rules_nonce');
 
 ?>
 <div class="table-responsive">
     <table id="wpinv-tax-rules" class="widefat fixed table">
-        <caption><?php echo esc_html_e( 'You can use this section to create or edit your tax rules', 'invoicing' ); ?></caption>
+        <caption><?php echo esc_html_e('You can use this section to create or edit your tax rules', 'invoicing'); ?></caption>
 
         <thead>
             <tr class="table-light">
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Unique Key', 'invoicing' ); ?>
+                    <?php esc_html_e('Unique Key', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Label', 'invoicing' ); ?>
+                    <?php esc_html_e('Label', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Calculate tax based on', 'invoicing' ); ?>
+                    <?php esc_html_e('Calculate tax based on', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Same country rule', 'invoicing' ); ?>
-                    <?php getpaid_get_help_tip( __( 'What should happen if a customer is from the same country as your business?.', 'invoicing' ), 'position-static', true ); ?>
+                    <?php esc_html_e('Same country rule', 'invoicing'); ?>
+                    <?php getpaid_get_help_tip(__('What should happen if a customer is from the same country as your business?.', 'invoicing'), 'position-static', true); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top" style="width:32px">&nbsp;</th>
@@ -46,8 +46,8 @@ 
         </thead>
 
         <tbody>
-            <?php foreach ( GetPaid_Tax::get_all_tax_rules() as $tax_rule ) : ?>
-                <?php include plugin_dir_path( __FILE__ ) . 'html-tax-rule-edit.php'; ?>
+            <?php foreach (GetPaid_Tax::get_all_tax_rules() as $tax_rule) : ?>
+                <?php include plugin_dir_path(__FILE__) . 'html-tax-rule-edit.php'; ?>
             <?php endforeach; ?>
         </tbody>
 
@@ -55,8 +55,8 @@ 
             <tr class="table-light">
                 <td colspan="4" class="border-top">
 
-                    <button type="button" class="button button-secondary wpinv_add_tax_rule" aria-label="<?php esc_attr_e( 'Add Tax Rule', 'invoicing' ); ?>">
-                        <span><?php esc_html_e( 'Add Tax Rule', 'invoicing' ); ?></span>
+                    <button type="button" class="button button-secondary wpinv_add_tax_rule" aria-label="<?php esc_attr_e('Add Tax Rule', 'invoicing'); ?>">
+                        <span><?php esc_html_e('Add Tax Rule', 'invoicing'); ?></span>
                     </button>
 
                 </td>
@@ -67,6 +67,6 @@ 
 
 <script type="text/html" id="tmpl-wpinv-tax-rule-row">
     <?php $tax_rule = $dummy_rule; ?>
-    <?php include plugin_dir_path( __FILE__ ) . 'html-tax-rule-edit.php'; ?>
+    <?php include plugin_dir_path(__FILE__) . 'html-tax-rule-edit.php'; ?>
 </script>
 

includes/admin/views/wizard-gateways.php

Spacing +18 added lines, -18 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -12,24 +12,24 @@ 
 
     <form method="post" class="text-center card-body">
         <div class="gp-wizard-payments">
-            <h2 class="gd-settings-title h3 "><?php esc_html_e( 'Gateway Setup', 'invoicing' ); ?></h2>
-            <p><?php esc_html_e( 'Below are a few gateways that can be setup in a few seconds.', 'invoicing' ); ?>
+            <h2 class="gd-settings-title h3 "><?php esc_html_e('Gateway Setup', 'invoicing'); ?></h2>
+            <p><?php esc_html_e('Below are a few gateways that can be setup in a few seconds.', 'invoicing'); ?>
                 <br>
-                <?php esc_html_e( 'We have 20+ Gateways that can be setup later.', 'invoicing' ); ?>
+                <?php esc_html_e('We have 20+ Gateways that can be setup later.', 'invoicing'); ?>
             </p>
 
             <ul class="list-group">
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg' ); ?>" class="ml-n2" alt="Stripe"></span>
-				    <?php if ( false === wpinv_get_option( 'stripe_live_connect_account_id' ) ) : ?>
+				    <span class="mr-auto"><img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg'); ?>" class="ml-n2" alt="Stripe"></span>
+				    <?php if (false === wpinv_get_option('stripe_live_connect_account_id')) : ?>
                         <a href="<?php
-                        echo esc_url( wp_nonce_url(
+                        echo esc_url(wp_nonce_url(
                             add_query_arg(
                                 array(
                                     'getpaid-admin-action' => 'connect_gateway',
                                     'plugin'               => 'stripe',
-                                    'redirect'             => urlencode( add_query_arg( 'step', 'payments' ) ),
+                                    'redirect'             => urlencode(add_query_arg('step', 'payments')),
                                 ),
                                 admin_url()
                             ),
@@ -37,31 +37,31 @@ 
                             'getpaid-nonce'
                         ));
                         ?>"
-                        class="btn btn-sm btn-outline-primary"><?php esc_html_e( 'Connect', 'invoicing' ); ?></a>
+                        class="btn btn-sm btn-outline-primary"><?php esc_html_e('Connect', 'invoicing'); ?></a>
                     <?php else : ?>
-                        <span class="btn btn-sm btn-success"><?php esc_html_e( 'Connected', 'invoicing' ); ?></span>
+                        <span class="btn btn-sm btn-success"><?php esc_html_e('Connected', 'invoicing'); ?></span>
                     <?php endif; ?>
 				</li>
 
 				<li class="list-group-item">
                     <div class="d-flex justify-content-between align-items-center">
                         <span class="mr-auto">
-                            <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp' ); ?>" class="" alt="PayPal" height="25">
+                            <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp'); ?>" class="" alt="PayPal" height="25">
                         </span>
                         <a
                             href="#"
                             onclick="jQuery('.getpaid-setup-paypal-input').toggleClass('d-none'); return false;"
-                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php esc_html_e( 'Set-up', 'invoicing' ); ?></a>
+                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php esc_html_e('Set-up', 'invoicing'); ?></a>
                     </div>
                     <div class="mt-4 getpaid-setup-paypal-input d-none">
-                        <input type="text" placeholder="<?php esc_attr_e( 'PayPal Email', 'invoicing' ); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr( wpinv_get_option( 'paypal_email' ) ); ?>">
+                        <input type="text" placeholder="<?php esc_attr_e('PayPal Email', 'invoicing'); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr(wpinv_get_option('paypal_email')); ?>">
                     </div>
                 </li>
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><?php esc_html_e( 'Test Gateway', 'invoicing' ); ?></span>
+				    <span class="mr-auto"><?php esc_html_e('Test Gateway', 'invoicing'); ?></span>
 					<div class="custom-control custom-switch">
-						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked( wpinv_is_gateway_active( 'manual' ) ); ?>>
+						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked(wpinv_is_gateway_active('manual')); ?>>
 						<label class="custom-control-label" for="enable-manual-gateway"></label>
 					</div>
 				</li>
@@ -70,10 +70,10 @@ 
         </div>
 
         <p class="gp-setup-actions step text-center mt-4">
-			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e( 'Continue', 'invoicing' ); ?>" />
+			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e('Continue', 'invoicing'); ?>" />
 		</p>
         
-        <?php getpaid_hidden_field( 'save_step', 1 ); ?>
-        <?php wp_nonce_field( 'getpaid-setup-wizard', 'getpaid-setup-wizard' ); ?>
+        <?php getpaid_hidden_field('save_step', 1); ?>
+        <?php wp_nonce_field('getpaid-setup-wizard', 'getpaid-setup-wizard'); ?>
     </form>
 </div>

Braces +5 added lines, -2 removed lines

@@ -38,8 +38,11 @@
                         ));
                         ?>"
                         class="btn btn-sm btn-outline-primary"><?php esc_html_e( 'Connect', 'invoicing' ); ?></a>
-                    <?php else : ?>
-                        <span class="btn btn-sm btn-success"><?php esc_html_e( 'Connected', 'invoicing' ); ?></span>
+                    <?php else {
+    : ?>
+                        <span class="btn btn-sm btn-success"><?php esc_html_e( 'Connected', 'invoicing' );
+}
+?></span>
                     <?php endif; ?>
 				</li>
 

includes/user-functions.php

Indentation +73 added lines, -73 removed lines

@@ -34,11 +34,11 @@ 
  */
 function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
 
-	if ( current_user_can( 'manage_options' ) ) {
-		return 'manage_options';
-	};
+    if ( current_user_can( 'manage_options' ) ) {
+        return 'manage_options';
+    };
 
-	return $capalibilty;
+    return $capalibilty;
 }
 
 /**
@@ -62,10 +62,10 @@ 
     // Prepare user values.
     $prefix = preg_replace( '/\s+/', '', $prefix );
     $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
-		'user_pass'  => wp_generate_password(),
-		'user_email' => $email,
+    $args   = array(
+        'user_login' => wpinv_generate_user_name( $prefix ),
+        'user_pass'  => wp_generate_password(),
+        'user_email' => $email,
         'role'       => 'subscriber',
     );
 
@@ -82,16 +82,16 @@ 
 function wpinv_generate_user_name( $prefix = '' ) {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
+    $prefix = strtok( $prefix, '@' );
     $prefix = trim( $prefix, '.' );
 
-	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+    // Sanitize the username.
+    $prefix = sanitize_user( $prefix, true );
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
-	}
+    $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+    if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
+        $prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+    }
 
     $username = $prefix;
     $postfix  = 2;
@@ -220,43 +220,43 @@ 
 
                     foreach ( getpaid_user_address_fields() as $key => $label ) {
 
-					// Display the country.
-					if ( 'country' == $key ) {
-
-						aui()->select(
-							array(
-								'options'     => wpinv_get_country_list(),
-								'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-								'id'          => 'wpinv-' . sanitize_html_class( $key ),
-								'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
-								'placeholder' => $label,
-								'label'       => wp_kses_post( $label ),
-								'label_type'  => 'vertical',
-								'class'       => 'getpaid-address-field',
+                    // Display the country.
+                    if ( 'country' == $key ) {
+
+                        aui()->select(
+                            array(
+                                'options'     => wpinv_get_country_list(),
+                                'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
+                                'id'          => 'wpinv-' . sanitize_html_class( $key ),
+                                'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
+                                'placeholder' => $label,
+                                'label'       => wp_kses_post( $label ),
+                                'label_type'  => 'vertical',
+                                'class'       => 'getpaid-address-field',
                             ),
                             true
-						);
-
-					}
-
-					// Display the state.
-					elseif ( 'state' == $key ) {
-
-						getpaid_get_states_select_markup(
-							getpaid_get_user_address_field( get_current_user_id(), 'country' ),
-							getpaid_get_user_address_field( get_current_user_id(), 'state' ),
-							$label,
-							$label,
-							'',
-							false,
-							'',
-							'getpaid_address[' . esc_attr( $key ) . ']',
+                        );
+
+                    }
+
+                    // Display the state.
+                    elseif ( 'state' == $key ) {
+
+                        getpaid_get_states_select_markup(
+                            getpaid_get_user_address_field( get_current_user_id(), 'country' ),
+                            getpaid_get_user_address_field( get_current_user_id(), 'state' ),
+                            $label,
+                            $label,
+                            '',
+                            false,
+                            '',
+                            'getpaid_address[' . esc_attr( $key ) . ']',
                             true
-						);
+                        );
 
                         } else {
 
-						aui()->input(
+                        aui()->input(
                             array(
                                 'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
                                 'id'          => 'wpinv-' . sanitize_html_class( $key ),
@@ -268,7 +268,7 @@ 
                                 'class'       => 'getpaid-address-field',
                             ),
                             true
-						);
+                        );
 
                         }
                     }
@@ -407,7 +407,7 @@ 
 function getpaid_allowed_html() {
     $allowed_html = wp_kses_allowed_html( 'post' );
 
-	// form fields
+    // form fields
     $allowed_html['form'] = array(
         'action'         => true,
         'accept'         => true,
@@ -419,12 +419,12 @@ 
     );
 
     // - input
-	$allowed_html['input'] = array(
-		'class'        => array(),
-		'id'           => array(),
-		'name'         => array(),
-		'value'        => array(),
-		'type'         => array(),
+    $allowed_html['input'] = array(
+        'class'        => array(),
+        'id'           => array(),
+        'name'         => array(),
+        'value'        => array(),
+        'type'         => array(),
         'placeholder'  => array(),
         'autocomplete' => array(),
         'autofocus'    => array(),
@@ -438,33 +438,33 @@ 
         'max'          => array(),
         'step'         => array(),
         'size'         => array(),
-	);
+    );
 
     // - input
-	$allowed_html['textarea'] = array(
-		'class' => array(),
-		'id'    => array(),
-		'name'  => array(),
-		'value' => array(),
-	);
-
-	// select
-	$allowed_html['select'] = array(
-		'class'        => array(),
-		'id'           => array(),
-		'name'         => array(),
+    $allowed_html['textarea'] = array(
+        'class' => array(),
+        'id'    => array(),
+        'name'  => array(),
+        'value' => array(),
+    );
+
+    // select
+    $allowed_html['select'] = array(
+        'class'        => array(),
+        'id'           => array(),
+        'name'         => array(),
         'autocomplete' => array(),
         'multiple'     => array(),
-	);
+    );
 
-	// select options
-	$allowed_html['option'] = array(
-		'selected' => array(),
+    // select options
+    $allowed_html['option'] = array(
+        'selected' => array(),
         'disabled' => array(),
         'value'    => array(),
-	);
+    );
 
-	return $allowed_html;
+    return $allowed_html;
 
 }