AyeCode / invoicing

includes/wpinv-helper-functions.php

Doc Comments +34 added lines, -1 removed lines

@@ -31,6 +31,9 @@ 
     return apply_filters( 'wpinv_get_ip', $ip );
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_user_agent() {
     if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
         $user_agent = sanitize_text_field( $_SERVER['HTTP_USER_AGENT'] );
@@ -41,6 +44,9 @@ 
     return apply_filters( 'wpinv_get_user_agent', $user_agent );
 }
 
+/**
+ * @param integer $decimals
+ */
 function wpinv_sanitize_amount( $amount, $decimals = NULL ) {
     $is_negative   = false;
     $thousands_sep = wpinv_thousands_separator();
@@ -79,6 +85,9 @@ 
 }
 add_filter( 'wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
 
+/**
+ * @param integer $decimals
+ */
 function wpinv_round_amount( $amount, $decimals = NULL ) {
     if ( $decimals === NULL ) {
         $decimals = wpinv_decimals();
@@ -117,6 +126,9 @@ 
     return $status;
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_currency() {
     $currency = wpinv_get_option( 'currency', 'USD' );
     
@@ -187,6 +199,9 @@ 
     return apply_filters( 'wpinv_currency_symbol', $currency_symbol, $currency );
 }
 
+/**
+ * @return string
+ */
 function wpinv_currency_position() {
     $position = wpinv_get_option( 'currency_position', 'left' );
     
@@ -315,6 +330,9 @@ 
     return $price;
 }
 
+/**
+ * @return string
+ */
 function wpinv_format_amount( $amount, $decimals = NULL, $calculate = false ) {
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
@@ -365,6 +383,9 @@ 
     return apply_filters( 'wpinv_sanitize_key', $key, $raw_key );
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_file_extension( $str ) {
     $parts = explode( '.', $str );
     return end( $parts );
@@ -569,6 +590,9 @@ 
     return strlen( $str );
 }
 
+/**
+ * @param string $str
+ */
 function wpinv_utf8_strtolower( $str, $encoding = 'UTF-8' ) {
     if ( function_exists( 'mb_strtolower' ) ) {
         return mb_strtolower( $str, $encoding );
@@ -577,6 +601,9 @@ 
     return strtolower( $str );
 }
 
+/**
+ * @param string $str
+ */
 function wpinv_utf8_strtoupper( $str, $encoding = 'UTF-8' ) {
     if ( function_exists( 'mb_strtoupper' ) ) {
         return mb_strtoupper( $str, $encoding );
@@ -654,7 +681,7 @@ 
  *
  * @param string $str The string being decoded.
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
- * @return string The width of string.
+ * @return integer The width of string.
  */
 function wpinv_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
     if ( function_exists( 'mb_strwidth' ) ) {
@@ -708,6 +735,12 @@ 
 if ( ! function_exists( 'cal_days_in_month' ) ) {
     // Fallback in case the calendar extension is not loaded in PHP
     // Only supports Gregorian calendar
+
+    /**
+     * @param integer $calendar
+     * @param string $month
+     * @param string $year
+     */
     function cal_days_in_month( $calendar, $month, $year ) {
         return date( 't', mktime( 0, 0, 0, $month, 1, $year ) );
     }

Spacing +367 added lines, -367 removed lines

@@ -7,89 +7,89 @@ 
  */
 
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_item_quantities_enabled() {
-    $ret = wpinv_get_option( 'item_quantities', true );
+    $ret = wpinv_get_option('item_quantities', true);
 
-    return (bool) apply_filters( 'wpinv_item_quantities_enabled', $ret );
+    return (bool)apply_filters('wpinv_item_quantities_enabled', $ret);
 }
 
 function wpinv_get_ip() {
     $ip = '127.0.0.1';
 
-    if ( !empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_CLIENT_IP'] );
-    } elseif ( !empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_X_FORWARDED_FOR'] );
-    } elseif( !empty( $_SERVER['REMOTE_ADDR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_CLIENT_IP']);
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_X_FORWARDED_FOR']);
+    } elseif (!empty($_SERVER['REMOTE_ADDR'])) {
+        $ip = sanitize_text_field($_SERVER['REMOTE_ADDR']);
     }
 
-    return apply_filters( 'wpinv_get_ip', $ip );
+    return apply_filters('wpinv_get_ip', $ip);
 }
 
 function wpinv_get_user_agent() {
-    if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
-        $user_agent = sanitize_text_field( $_SERVER['HTTP_USER_AGENT'] );
+    if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+        $user_agent = sanitize_text_field($_SERVER['HTTP_USER_AGENT']);
     } else {
         $user_agent = '';
     }
 
-    return apply_filters( 'wpinv_get_user_agent', $user_agent );
+    return apply_filters('wpinv_get_user_agent', $user_agent);
 }
 
-function wpinv_sanitize_amount( $amount, $decimals = NULL ) {
+function wpinv_sanitize_amount($amount, $decimals = NULL) {
     $is_negative   = false;
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
     // Sanitize the amount
-    if ( $decimal_sep == ',' && false !== ( $found = strpos( $amount, $decimal_sep ) ) ) {
-        if ( ( $thousands_sep == '.' || $thousands_sep == ' ' ) && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-            $amount = str_replace( $thousands_sep, '', $amount );
-        } elseif( empty( $thousands_sep ) && false !== ( $found = strpos( $amount, '.' ) ) ) {
-            $amount = str_replace( '.', '', $amount );
+    if ($decimal_sep == ',' && false !== ($found = strpos($amount, $decimal_sep))) {
+        if (($thousands_sep == '.' || $thousands_sep == ' ') && false !== ($found = strpos($amount, $thousands_sep))) {
+            $amount = str_replace($thousands_sep, '', $amount);
+        } elseif (empty($thousands_sep) && false !== ($found = strpos($amount, '.'))) {
+            $amount = str_replace('.', '', $amount);
         }
 
-        $amount = str_replace( $decimal_sep, '.', $amount );
-    } elseif( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( $thousands_sep, '', $amount );
+        $amount = str_replace($decimal_sep, '.', $amount);
+    } elseif ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace($thousands_sep, '', $amount);
     }
 
-    if( $amount < 0 ) {
+    if ($amount < 0) {
         $is_negative = true;
     }
 
-    $amount   = preg_replace( '/[^0-9\.]/', '', $amount );
+    $amount   = preg_replace('/[^0-9\.]/', '', $amount);
 
-    $decimals = apply_filters( 'wpinv_sanitize_amount_decimals', absint( $decimals ), $amount );
-    $amount   = number_format( (double) $amount, absint( $decimals ), '.', '' );
+    $decimals = apply_filters('wpinv_sanitize_amount_decimals', absint($decimals), $amount);
+    $amount   = number_format((double)$amount, absint($decimals), '.', '');
 
-    if( $is_negative ) {
+    if ($is_negative) {
         $amount *= -1;
     }
 
-    return apply_filters( 'wpinv_sanitize_amount', $amount, $decimals );
+    return apply_filters('wpinv_sanitize_amount', $amount, $decimals);
 }
-add_filter( 'wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_round_amount( $amount, $decimals = NULL ) {
-    if ( $decimals === NULL ) {
+function wpinv_round_amount($amount, $decimals = NULL) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
-    $amount = round( (double)$amount, wpinv_currency_decimal_filter( absint( $decimals ) ) );
+    $amount = round((double)$amount, wpinv_currency_decimal_filter(absint($decimals)));
 
-    return apply_filters( 'wpinv_round_amount', $amount, $decimals );
+    return apply_filters('wpinv_round_amount', $amount, $decimals);
 }
 
-function wpinv_get_invoice_statuses( $trashed = false ) {
+function wpinv_get_invoice_statuses($trashed = false) {
     global $post;
     $invoice_statuses = array();
     $invoice_statuses = array(
@@ -103,32 +103,32 @@ 
         'wpi-renewal' => __('Renewal Payment', 'invoicing')
     );
 
-    if ( $trashed ) {
-        $invoice_statuses['trash'] = __( 'Trash', 'invoicing' );
+    if ($trashed) {
+        $invoice_statuses['trash'] = __('Trash', 'invoicing');
     }
 
-    return apply_filters( 'wpinv_statuses', $invoice_statuses );
+    return apply_filters('wpinv_statuses', $invoice_statuses);
 }
 
-function wpinv_status_nicename( $status ) {
+function wpinv_status_nicename($status) {
     $statuses = wpinv_get_invoice_statuses();
-    $status   = isset( $statuses[$status] ) ? $statuses[$status] : __( $status, 'invoicing' );
+    $status   = isset($statuses[$status]) ? $statuses[$status] : __($status, 'invoicing');
 
     return $status;
 }
 
 function wpinv_get_currency() {
-    $currency = wpinv_get_option( 'currency', 'USD' );
+    $currency = wpinv_get_option('currency', 'USD');
 
-    return apply_filters( 'wpinv_currency', $currency );
+    return apply_filters('wpinv_currency', $currency);
 }
 
-function wpinv_currency_symbol( $currency = '' ) {
-    if ( empty( $currency ) ) {
+function wpinv_currency_symbol($currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
-    $symbols = apply_filters( 'wpinv_currency_symbols', array(
+    $symbols = apply_filters('wpinv_currency_symbols', array(
         'AED' => '&#x62f;.&#x625;',
         'AFN' => '&#x60b;',
         'ALL' => 'L',
@@ -291,208 +291,208 @@ 
         'YER' => '&#xfdfc;',
         'ZAR' => '&#82;',
         'ZMW' => 'ZK',
-    ) );
+    ));
 
-    $currency_symbol = isset( $symbols[$currency] ) ? $symbols[$currency] : $currency;
+    $currency_symbol = isset($symbols[$currency]) ? $symbols[$currency] : $currency;
 
-    return apply_filters( 'wpinv_currency_symbol', $currency_symbol, $currency );
+    return apply_filters('wpinv_currency_symbol', $currency_symbol, $currency);
 }
 
 function wpinv_currency_position() {
-    $position = wpinv_get_option( 'currency_position', 'left' );
+    $position = wpinv_get_option('currency_position', 'left');
 
-    return apply_filters( 'wpinv_currency_position', $position );
+    return apply_filters('wpinv_currency_position', $position);
 }
 
 function wpinv_thousands_separator() {
-    $thousand_sep = wpinv_get_option( 'thousands_separator', ',' );
+    $thousand_sep = wpinv_get_option('thousands_separator', ',');
 
-    return apply_filters( 'wpinv_thousands_separator', $thousand_sep );
+    return apply_filters('wpinv_thousands_separator', $thousand_sep);
 }
 
 function wpinv_decimal_separator() {
-    $decimal_sep = wpinv_get_option( 'decimal_separator', '.' );
+    $decimal_sep = wpinv_get_option('decimal_separator', '.');
 
-    return apply_filters( 'wpinv_decimal_separator', $decimal_sep );
+    return apply_filters('wpinv_decimal_separator', $decimal_sep);
 }
 
 function wpinv_decimals() {
-    $decimals = apply_filters( 'wpinv_decimals', wpinv_get_option( 'decimals', 2 ) );
+    $decimals = apply_filters('wpinv_decimals', wpinv_get_option('decimals', 2));
 
-    return absint( $decimals );
+    return absint($decimals);
 }
 
 function wpinv_get_currencies() {
     $currencies = array(
-        'USD' => __( 'US Dollar', 'invoicing' ),
-        'EUR' => __( 'Euro', 'invoicing' ),
-        'GBP' => __( 'Pound Sterling', 'invoicing' ),
-        'AFN' => __( 'Afghan Afghani', 'invoicing' ),
-        'ALL' => __( 'Albanian Lek', 'invoicing' ),
-        'AMD' => __( 'Armenian Dram', 'invoicing' ),
-        'ANG' => __( 'Netherlands Antillean Guilder', 'invoicing' ),
-        'AOA' => __( 'Angolan Kwanza', 'invoicing' ),
-        'ARS' => __( 'Argentine Peso', 'invoicing' ),
-        'AUD' => __( 'Australian Dollar', 'invoicing' ),
-        'AWG' => __( 'Aruban Florin', 'invoicing' ),
-        'AZN' => __( 'Azerbaijani Manat', 'invoicing' ),
-        'BAM' => __( 'Bosnia and Herzegovina Convertible Marka', 'invoicing' ),
-        'BBD' => __( 'Barbadian Dollar', 'invoicing' ),
-        'BDT' => __( 'Bangladeshi Taka', 'invoicing' ),
-        'BGN' => __( 'Bulgarian Lev', 'invoicing' ),
-        'BHD' => __( 'Bahraini Dinar', 'invoicing' ),
-        'BIF' => __( 'Burundian Franc', 'invoicing' ),
-        'BMD' => __( 'Bermudian Dollar', 'invoicing' ),
-        'BND' => __( 'Brunei Dollar', 'invoicing' ),
-        'BOB' => __( 'Bolivian Boliviano', 'invoicing' ),
-        'BRL' => __( 'Brazilian Real', 'invoicing' ),
-        'BSD' => __( 'Bahamian Dollar', 'invoicing' ),
-        'BTC' => __( 'Bitcoin', 'invoicing' ),
-        'BTN' => __( 'Bhutanese Ngultrum', 'invoicing' ),
-        'BWP' => __( 'Botswana Pula', 'invoicing' ),
-        'BYR' => __( 'Belarusian Ruble', 'invoicing' ),
-        'BZD' => __( 'Belize Dollar', 'invoicing' ),
-        'CAD' => __( 'Canadian Dollar', 'invoicing' ),
-        'CDF' => __( 'Congolese Franc', 'invoicing' ),
-        'CHF' => __( 'Swiss Franc', 'invoicing' ),
-        'CLP' => __( 'Chilean Peso', 'invoicing' ),
-        'CNY' => __( 'Chinese Yuan', 'invoicing' ),
-        'COP' => __( 'Colombian Peso', 'invoicing' ),
-        'CRC' => __( 'Costa Rican Colon', 'invoicing' ),
-        'CUC' => __( 'Cuban Convertible Peso', 'invoicing' ),
-        'CUP' => __( 'Cuban Peso', 'invoicing' ),
-        'CVE' => __( 'Cape Verdean escudo', 'invoicing' ),
-        'CZK' => __( 'Czech Koruna', 'invoicing' ),
-        'DJF' => __( 'Djiboutian Franc', 'invoicing' ),
-        'DKK' => __( 'Danish Krone', 'invoicing' ),
-        'DOP' => __( 'Dominican Peso', 'invoicing' ),
-        'DZD' => __( 'Algerian Dinar', 'invoicing' ),
-        'EGP' => __( 'Egyptian Pound', 'invoicing' ),
-        'ERN' => __( 'Eritrean Nakfa', 'invoicing' ),
-        'ETB' => __( 'Ethiopian irr', 'invoicing' ),
-        'FJD' => __( 'Fijian Dollar', 'invoicing' ),
-        'FKP' => __( 'Falkland Islands Pound', 'invoicing' ),
-        'GEL' => __( 'Georgian lari', 'invoicing' ),
-        'GGP' => __( 'Guernsey Pound', 'invoicing' ),
-        'GHS' => __( 'Ghana cedi', 'invoicing' ),
-        'GIP' => __( 'Gibraltar Pound', 'invoicing' ),
-        'GMD' => __( 'Gambian Dalasi', 'invoicing' ),
-        'GNF' => __( 'Guinean Franc', 'invoicing' ),
-        'GTQ' => __( 'Guatemalan Quetzal', 'invoicing' ),
-        'GYD' => __( 'Guyanese Dollar', 'invoicing' ),
-        'HKD' => __( 'Hong Kong Dollar', 'invoicing' ),
-        'HNL' => __( 'Honduran Lempira', 'invoicing' ),
-        'HRK' => __( 'Croatian Kuna', 'invoicing' ),
-        'HTG' => __( 'Haitian Gourde', 'invoicing' ),
-        'HUF' => __( 'Hungarian Forint', 'invoicing' ),
-        'IDR' => __( 'Indonesian Rupiah', 'invoicing' ),
-        'ILS' => __( 'Israeli New Shekel', 'invoicing' ),
-        'IMP' => __( 'Manx Pound', 'invoicing' ),
-        'INR' => __( 'Indian Rupee', 'invoicing' ),
-        'IQD' => __( 'Iraqi Dinar', 'invoicing' ),
-        'IRR' => __( 'Iranian Rial', 'invoicing' ),
-        'IRT' => __( 'Iranian Toman', 'invoicing' ),
-        'ISK' => __( 'Icelandic Krona', 'invoicing' ),
-        'JEP' => __( 'Jersey Pound', 'invoicing' ),
-        'JMD' => __( 'Jamaican Dollar', 'invoicing' ),
-        'JOD' => __( 'Jordanian Dinar', 'invoicing' ),
-        'JPY' => __( 'Japanese Yen', 'invoicing' ),
-        'KES' => __( 'Kenyan Shilling', 'invoicing' ),
-        'KGS' => __( 'Kyrgyzstani Som', 'invoicing' ),
-        'KHR' => __( 'Cambodian Riel', 'invoicing' ),
-        'KMF' => __( 'Comorian Franc', 'invoicing' ),
-        'KPW' => __( 'North Korean Won', 'invoicing' ),
-        'KRW' => __( 'South Korean Won', 'invoicing' ),
-        'KWD' => __( 'Kuwaiti Dinar', 'invoicing' ),
-        'KYD' => __( 'Cayman Islands Dollar', 'invoicing' ),
-        'KZT' => __( 'Kazakhstani Tenge', 'invoicing' ),
-        'LAK' => __( 'Lao Kip', 'invoicing' ),
-        'LBP' => __( 'Lebanese Pound', 'invoicing' ),
-        'LKR' => __( 'Sri Lankan Rupee', 'invoicing' ),
-        'LRD' => __( 'Liberian Dollar', 'invoicing' ),
-        'LSL' => __( 'Lesotho Loti', 'invoicing' ),
-        'LYD' => __( 'Libyan Dinar', 'invoicing' ),
-        'MAD' => __( 'Moroccan Dirham', 'invoicing' ),
-        'MDL' => __( 'Moldovan Leu', 'invoicing' ),
-        'MGA' => __( 'Malagasy Ariary', 'invoicing' ),
-        'MKD' => __( 'Macedonian Denar', 'invoicing' ),
-        'MMK' => __( 'Burmese Kyat', 'invoicing' ),
-        'MNT' => __( 'Mongolian Tughrik', 'invoicing' ),
-        'MOP' => __( 'Macanese Pataca', 'invoicing' ),
-        'MRO' => __( 'Mauritanian Ouguiya', 'invoicing' ),
-        'MUR' => __( 'Mauritian Rupee', 'invoicing' ),
-        'MVR' => __( 'Maldivian Rufiyaa', 'invoicing' ),
-        'MWK' => __( 'Malawian Kwacha', 'invoicing' ),
-        'MXN' => __( 'Mexican Peso', 'invoicing' ),
-        'MYR' => __( 'Malaysian Ringgit', 'invoicing' ),
-        'MZN' => __( 'Mozambican Metical', 'invoicing' ),
-        'NAD' => __( 'Namibian Dollar', 'invoicing' ),
-        'NGN' => __( 'Nigerian Naira', 'invoicing' ),
-        'NIO' => __( 'Nicaraguan Cordoba', 'invoicing' ),
-        'NOK' => __( 'Norwegian Krone', 'invoicing' ),
-        'NPR' => __( 'Nepalese Rupee', 'invoicing' ),
-        'NZD' => __( 'New Zealand Dollar', 'invoicing' ),
-        'OMR' => __( 'Omani Rial', 'invoicing' ),
-        'PAB' => __( 'Panamanian Balboa', 'invoicing' ),
-        'PEN' => __( 'Peruvian Nuevo Sol', 'invoicing' ),
-        'PGK' => __( 'Papua New Guinean Kina', 'invoicing' ),
-        'PHP' => __( 'Philippine Peso', 'invoicing' ),
-        'PKR' => __( 'Pakistani Rupee', 'invoicing' ),
-        'PLN' => __( 'Polish Zloty', 'invoicing' ),
-        'PRB' => __( 'Transnistrian Ruble', 'invoicing' ),
-        'PYG' => __( 'Paraguayan Guarani', 'invoicing' ),
-        'QAR' => __( 'Qatari Riyal', 'invoicing' ),
-        'RON' => __( 'Romanian Leu', 'invoicing' ),
-        'RSD' => __( 'Serbian Dinar', 'invoicing' ),
-        'RUB' => __( 'Russian Ruble', 'invoicing' ),
-        'RWF' => __( 'Rwandan Franc', 'invoicing' ),
-        'SAR' => __( 'Saudi Riyal', 'invoicing' ),
-        'SBD' => __( 'Solomon Islands Dollar', 'invoicing' ),
-        'SCR' => __( 'Seychellois Rupee', 'invoicing' ),
-        'SDG' => __( 'Sudanese Pound', 'invoicing' ),
-        'SEK' => __( 'Swedish Krona', 'invoicing' ),
-        'SGD' => __( 'Singapore Dollar', 'invoicing' ),
-        'SHP' => __( 'Saint Helena Pound', 'invoicing' ),
-        'SLL' => __( 'Sierra Leonean Leone', 'invoicing' ),
-        'SOS' => __( 'Somali Shilling', 'invoicing' ),
-        'SRD' => __( 'Surinamese Dollar', 'invoicing' ),
-        'SSP' => __( 'South Sudanese Pound', 'invoicing' ),
-        'STD' => __( 'Sao Tomean Dobra', 'invoicing' ),
-        'SYP' => __( 'Syrian Pound', 'invoicing' ),
-        'SZL' => __( 'Swazi Lilangeni', 'invoicing' ),
-        'THB' => __( 'Thai Baht', 'invoicing' ),
-        'TJS' => __( 'Tajikistani Somoni', 'invoicing' ),
-        'TMT' => __( 'Turkmenistan Manat', 'invoicing' ),
-        'TND' => __( 'Tunisian Dinar', 'invoicing' ),
-        'TOP' => __( 'Tongan Pa&#x2bb;anga', 'invoicing' ),
-        'TRY' => __( 'Turkish Lira', 'invoicing' ),
-        'TTD' => __( 'Trinidad and Tobago Dollar', 'invoicing' ),
-        'TWD' => __( 'New Taiwan Dollar', 'invoicing' ),
-        'TZS' => __( 'Tanzanian Shilling', 'invoicing' ),
-        'UAH' => __( 'Ukrainian Hryvnia', 'invoicing' ),
-        'UGX' => __( 'Ugandan Shilling', 'invoicing' ),
-        'UYU' => __( 'Uruguayan Peso', 'invoicing' ),
-        'UZS' => __( 'Uzbekistani Som', 'invoicing' ),
-        'VEF' => __( 'Venezuelan Bol&iacute;var', 'invoicing' ),
-        'VND' => __( 'Vietnamese Dong', 'invoicing' ),
-        'VUV' => __( 'Vanuatu Vatu', 'invoicing' ),
-        'WST' => __( 'Samoan Tala', 'invoicing' ),
-        'XAF' => __( 'Central African CFA Franc', 'invoicing' ),
-        'XCD' => __( 'East Caribbean Dollar', 'invoicing' ),
-        'XOF' => __( 'West African CFA Franc', 'invoicing' ),
-        'XPF' => __( 'CFP Franc', 'invoicing' ),
-        'YER' => __( 'Yemeni Rial', 'invoicing' ),
-        'ZAR' => __( 'South African Rand', 'invoicing' ),
-        'ZMW' => __( 'Zambian Kwacha', 'invoicing' ),
+        'USD' => __('US Dollar', 'invoicing'),
+        'EUR' => __('Euro', 'invoicing'),
+        'GBP' => __('Pound Sterling', 'invoicing'),
+        'AFN' => __('Afghan Afghani', 'invoicing'),
+        'ALL' => __('Albanian Lek', 'invoicing'),
+        'AMD' => __('Armenian Dram', 'invoicing'),
+        'ANG' => __('Netherlands Antillean Guilder', 'invoicing'),
+        'AOA' => __('Angolan Kwanza', 'invoicing'),
+        'ARS' => __('Argentine Peso', 'invoicing'),
+        'AUD' => __('Australian Dollar', 'invoicing'),
+        'AWG' => __('Aruban Florin', 'invoicing'),
+        'AZN' => __('Azerbaijani Manat', 'invoicing'),
+        'BAM' => __('Bosnia and Herzegovina Convertible Marka', 'invoicing'),
+        'BBD' => __('Barbadian Dollar', 'invoicing'),
+        'BDT' => __('Bangladeshi Taka', 'invoicing'),
+        'BGN' => __('Bulgarian Lev', 'invoicing'),
+        'BHD' => __('Bahraini Dinar', 'invoicing'),
+        'BIF' => __('Burundian Franc', 'invoicing'),
+        'BMD' => __('Bermudian Dollar', 'invoicing'),
+        'BND' => __('Brunei Dollar', 'invoicing'),
+        'BOB' => __('Bolivian Boliviano', 'invoicing'),
+        'BRL' => __('Brazilian Real', 'invoicing'),
+        'BSD' => __('Bahamian Dollar', 'invoicing'),
+        'BTC' => __('Bitcoin', 'invoicing'),
+        'BTN' => __('Bhutanese Ngultrum', 'invoicing'),
+        'BWP' => __('Botswana Pula', 'invoicing'),
+        'BYR' => __('Belarusian Ruble', 'invoicing'),
+        'BZD' => __('Belize Dollar', 'invoicing'),
+        'CAD' => __('Canadian Dollar', 'invoicing'),
+        'CDF' => __('Congolese Franc', 'invoicing'),
+        'CHF' => __('Swiss Franc', 'invoicing'),
+        'CLP' => __('Chilean Peso', 'invoicing'),
+        'CNY' => __('Chinese Yuan', 'invoicing'),
+        'COP' => __('Colombian Peso', 'invoicing'),
+        'CRC' => __('Costa Rican Colon', 'invoicing'),
+        'CUC' => __('Cuban Convertible Peso', 'invoicing'),
+        'CUP' => __('Cuban Peso', 'invoicing'),
+        'CVE' => __('Cape Verdean escudo', 'invoicing'),
+        'CZK' => __('Czech Koruna', 'invoicing'),
+        'DJF' => __('Djiboutian Franc', 'invoicing'),
+        'DKK' => __('Danish Krone', 'invoicing'),
+        'DOP' => __('Dominican Peso', 'invoicing'),
+        'DZD' => __('Algerian Dinar', 'invoicing'),
+        'EGP' => __('Egyptian Pound', 'invoicing'),
+        'ERN' => __('Eritrean Nakfa', 'invoicing'),
+        'ETB' => __('Ethiopian irr', 'invoicing'),
+        'FJD' => __('Fijian Dollar', 'invoicing'),
+        'FKP' => __('Falkland Islands Pound', 'invoicing'),
+        'GEL' => __('Georgian lari', 'invoicing'),
+        'GGP' => __('Guernsey Pound', 'invoicing'),
+        'GHS' => __('Ghana cedi', 'invoicing'),
+        'GIP' => __('Gibraltar Pound', 'invoicing'),
+        'GMD' => __('Gambian Dalasi', 'invoicing'),
+        'GNF' => __('Guinean Franc', 'invoicing'),
+        'GTQ' => __('Guatemalan Quetzal', 'invoicing'),
+        'GYD' => __('Guyanese Dollar', 'invoicing'),
+        'HKD' => __('Hong Kong Dollar', 'invoicing'),
+        'HNL' => __('Honduran Lempira', 'invoicing'),
+        'HRK' => __('Croatian Kuna', 'invoicing'),
+        'HTG' => __('Haitian Gourde', 'invoicing'),
+        'HUF' => __('Hungarian Forint', 'invoicing'),
+        'IDR' => __('Indonesian Rupiah', 'invoicing'),
+        'ILS' => __('Israeli New Shekel', 'invoicing'),
+        'IMP' => __('Manx Pound', 'invoicing'),
+        'INR' => __('Indian Rupee', 'invoicing'),
+        'IQD' => __('Iraqi Dinar', 'invoicing'),
+        'IRR' => __('Iranian Rial', 'invoicing'),
+        'IRT' => __('Iranian Toman', 'invoicing'),
+        'ISK' => __('Icelandic Krona', 'invoicing'),
+        'JEP' => __('Jersey Pound', 'invoicing'),
+        'JMD' => __('Jamaican Dollar', 'invoicing'),
+        'JOD' => __('Jordanian Dinar', 'invoicing'),
+        'JPY' => __('Japanese Yen', 'invoicing'),
+        'KES' => __('Kenyan Shilling', 'invoicing'),
+        'KGS' => __('Kyrgyzstani Som', 'invoicing'),
+        'KHR' => __('Cambodian Riel', 'invoicing'),
+        'KMF' => __('Comorian Franc', 'invoicing'),
+        'KPW' => __('North Korean Won', 'invoicing'),
+        'KRW' => __('South Korean Won', 'invoicing'),
+        'KWD' => __('Kuwaiti Dinar', 'invoicing'),
+        'KYD' => __('Cayman Islands Dollar', 'invoicing'),
+        'KZT' => __('Kazakhstani Tenge', 'invoicing'),
+        'LAK' => __('Lao Kip', 'invoicing'),
+        'LBP' => __('Lebanese Pound', 'invoicing'),
+        'LKR' => __('Sri Lankan Rupee', 'invoicing'),
+        'LRD' => __('Liberian Dollar', 'invoicing'),
+        'LSL' => __('Lesotho Loti', 'invoicing'),
+        'LYD' => __('Libyan Dinar', 'invoicing'),
+        'MAD' => __('Moroccan Dirham', 'invoicing'),
+        'MDL' => __('Moldovan Leu', 'invoicing'),
+        'MGA' => __('Malagasy Ariary', 'invoicing'),
+        'MKD' => __('Macedonian Denar', 'invoicing'),
+        'MMK' => __('Burmese Kyat', 'invoicing'),
+        'MNT' => __('Mongolian Tughrik', 'invoicing'),
+        'MOP' => __('Macanese Pataca', 'invoicing'),
+        'MRO' => __('Mauritanian Ouguiya', 'invoicing'),
+        'MUR' => __('Mauritian Rupee', 'invoicing'),
+        'MVR' => __('Maldivian Rufiyaa', 'invoicing'),
+        'MWK' => __('Malawian Kwacha', 'invoicing'),
+        'MXN' => __('Mexican Peso', 'invoicing'),
+        'MYR' => __('Malaysian Ringgit', 'invoicing'),
+        'MZN' => __('Mozambican Metical', 'invoicing'),
+        'NAD' => __('Namibian Dollar', 'invoicing'),
+        'NGN' => __('Nigerian Naira', 'invoicing'),
+        'NIO' => __('Nicaraguan Cordoba', 'invoicing'),
+        'NOK' => __('Norwegian Krone', 'invoicing'),
+        'NPR' => __('Nepalese Rupee', 'invoicing'),
+        'NZD' => __('New Zealand Dollar', 'invoicing'),
+        'OMR' => __('Omani Rial', 'invoicing'),
+        'PAB' => __('Panamanian Balboa', 'invoicing'),
+        'PEN' => __('Peruvian Nuevo Sol', 'invoicing'),
+        'PGK' => __('Papua New Guinean Kina', 'invoicing'),
+        'PHP' => __('Philippine Peso', 'invoicing'),
+        'PKR' => __('Pakistani Rupee', 'invoicing'),
+        'PLN' => __('Polish Zloty', 'invoicing'),
+        'PRB' => __('Transnistrian Ruble', 'invoicing'),
+        'PYG' => __('Paraguayan Guarani', 'invoicing'),
+        'QAR' => __('Qatari Riyal', 'invoicing'),
+        'RON' => __('Romanian Leu', 'invoicing'),
+        'RSD' => __('Serbian Dinar', 'invoicing'),
+        'RUB' => __('Russian Ruble', 'invoicing'),
+        'RWF' => __('Rwandan Franc', 'invoicing'),
+        'SAR' => __('Saudi Riyal', 'invoicing'),
+        'SBD' => __('Solomon Islands Dollar', 'invoicing'),
+        'SCR' => __('Seychellois Rupee', 'invoicing'),
+        'SDG' => __('Sudanese Pound', 'invoicing'),
+        'SEK' => __('Swedish Krona', 'invoicing'),
+        'SGD' => __('Singapore Dollar', 'invoicing'),
+        'SHP' => __('Saint Helena Pound', 'invoicing'),
+        'SLL' => __('Sierra Leonean Leone', 'invoicing'),
+        'SOS' => __('Somali Shilling', 'invoicing'),
+        'SRD' => __('Surinamese Dollar', 'invoicing'),
+        'SSP' => __('South Sudanese Pound', 'invoicing'),
+        'STD' => __('Sao Tomean Dobra', 'invoicing'),
+        'SYP' => __('Syrian Pound', 'invoicing'),
+        'SZL' => __('Swazi Lilangeni', 'invoicing'),
+        'THB' => __('Thai Baht', 'invoicing'),
+        'TJS' => __('Tajikistani Somoni', 'invoicing'),
+        'TMT' => __('Turkmenistan Manat', 'invoicing'),
+        'TND' => __('Tunisian Dinar', 'invoicing'),
+        'TOP' => __('Tongan Pa&#x2bb;anga', 'invoicing'),
+        'TRY' => __('Turkish Lira', 'invoicing'),
+        'TTD' => __('Trinidad and Tobago Dollar', 'invoicing'),
+        'TWD' => __('New Taiwan Dollar', 'invoicing'),
+        'TZS' => __('Tanzanian Shilling', 'invoicing'),
+        'UAH' => __('Ukrainian Hryvnia', 'invoicing'),
+        'UGX' => __('Ugandan Shilling', 'invoicing'),
+        'UYU' => __('Uruguayan Peso', 'invoicing'),
+        'UZS' => __('Uzbekistani Som', 'invoicing'),
+        'VEF' => __('Venezuelan Bol&iacute;var', 'invoicing'),
+        'VND' => __('Vietnamese Dong', 'invoicing'),
+        'VUV' => __('Vanuatu Vatu', 'invoicing'),
+        'WST' => __('Samoan Tala', 'invoicing'),
+        'XAF' => __('Central African CFA Franc', 'invoicing'),
+        'XCD' => __('East Caribbean Dollar', 'invoicing'),
+        'XOF' => __('West African CFA Franc', 'invoicing'),
+        'XPF' => __('CFP Franc', 'invoicing'),
+        'YER' => __('Yemeni Rial', 'invoicing'),
+        'ZAR' => __('South African Rand', 'invoicing'),
+        'ZMW' => __('Zambian Kwacha', 'invoicing'),
     );
 
     //asort( $currencies ); // this
 
-    return apply_filters( 'wpinv_currencies', $currencies );
+    return apply_filters('wpinv_currencies', $currencies);
 }
 
-function wpinv_price( $amount = '', $currency = '' ) {
-    if( empty( $currency ) ) {
+function wpinv_price($amount = '', $currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
@@ -500,14 +500,14 @@ 
 
     $negative = $amount < 0;
 
-    if ( $negative ) {
-        $amount = substr( $amount, 1 );
+    if ($negative) {
+        $amount = substr($amount, 1);
     }
 
-    $symbol = wpinv_currency_symbol( $currency );
+    $symbol = wpinv_currency_symbol($currency);
 
-    if ( $position == 'left' || $position == 'left_space' ) {
-        switch ( $currency ) {
+    if ($position == 'left' || $position == 'left_space') {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -519,15 +519,15 @@ 
             case "NZD" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
             default :
                 //$price = $currency . ' ' . $amount;
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
         }
     } else {
-        switch ( $currency ) {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -538,83 +538,83 @@ 
             case "MXN" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
             default :
                 //$price = $amount . ' ' . $currency;
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
         }
     }
 
-    if ( $negative ) {
+    if ($negative) {
         $price = '-' . $price;
     }
 
-    $price = apply_filters( 'wpinv_' . strtolower( $currency ) . '_currency_filter_' . $position, $price, $currency, $amount );
+    $price = apply_filters('wpinv_' . strtolower($currency) . '_currency_filter_' . $position, $price, $currency, $amount);
 
     return $price;
 }
 
-function wpinv_format_amount( $amount, $decimals = NULL, $calculate = false ) {
+function wpinv_format_amount($amount, $decimals = NULL, $calculate = false) {
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
 
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
-    if ( $decimal_sep == ',' && false !== ( $sep_found = strpos( $amount, $decimal_sep ) ) ) {
-        $whole = substr( $amount, 0, $sep_found );
-        $part = substr( $amount, $sep_found + 1, ( strlen( $amount ) - 1 ) );
+    if ($decimal_sep == ',' && false !== ($sep_found = strpos($amount, $decimal_sep))) {
+        $whole = substr($amount, 0, $sep_found);
+        $part = substr($amount, $sep_found + 1, (strlen($amount) - 1));
         $amount = $whole . '.' . $part;
     }
 
-    if ( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ',', '', $amount );
+    if ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(',', '', $amount);
     }
 
-    if ( $thousands_sep == ' ' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ' ', '', $amount );
+    if ($thousands_sep == ' ' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(' ', '', $amount);
     }
 
-    if ( empty( $amount ) ) {
+    if (empty($amount)) {
         $amount = 0;
     }
 
-    $decimals  = apply_filters( 'wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate );
-    $formatted = number_format( (float)$amount, $decimals, $decimal_sep, $thousands_sep );
+    $decimals  = apply_filters('wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate);
+    $formatted = number_format((float)$amount, $decimals, $decimal_sep, $thousands_sep);
 
-    if ( $calculate ) {
-        if ( $thousands_sep === "," ) {
-            $formatted = str_replace( ",", "", $formatted );
+    if ($calculate) {
+        if ($thousands_sep === ",") {
+            $formatted = str_replace(",", "", $formatted);
         }
 
-        if ( $decimal_sep === "," ) {
-            $formatted = str_replace( ",", ".", $formatted );
+        if ($decimal_sep === ",") {
+            $formatted = str_replace(",", ".", $formatted);
         }
     }
 
-    return apply_filters( 'wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate );
+    return apply_filters('wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate);
 }
-add_filter( 'wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_sanitize_key( $key ) {
+function wpinv_sanitize_key($key) {
     $raw_key = $key;
-    $key = preg_replace( '/[^a-zA-Z0-9_\-\.\:\/]/', '', $key );
+    $key = preg_replace('/[^a-zA-Z0-9_\-\.\:\/]/', '', $key);
 
-    return apply_filters( 'wpinv_sanitize_key', $key, $raw_key );
+    return apply_filters('wpinv_sanitize_key', $key, $raw_key);
 }
 
-function wpinv_get_file_extension( $str ) {
-    $parts = explode( '.', $str );
-    return end( $parts );
+function wpinv_get_file_extension($str) {
+    $parts = explode('.', $str);
+    return end($parts);
 }
 
-function wpinv_string_is_image_url( $str ) {
-    $ext = wpinv_get_file_extension( $str );
+function wpinv_string_is_image_url($str) {
+    $ext = wpinv_get_file_extension($str);
 
-    switch ( strtolower( $ext ) ) {
+    switch (strtolower($ext)) {
         case 'jpeg';
         case 'jpg';
             $return = true;
@@ -630,32 +630,32 @@ 
             break;
     }
 
-    return (bool)apply_filters( 'wpinv_string_is_image', $return, $str );
+    return (bool)apply_filters('wpinv_string_is_image', $return, $str);
 }
 
-function wpinv_error_log( $log, $title = '', $file = '', $line = '', $exit = false ) {
-    $should_log = apply_filters( 'wpinv_log_errors', WP_DEBUG );
+function wpinv_error_log($log, $title = '', $file = '', $line = '', $exit = false) {
+    $should_log = apply_filters('wpinv_log_errors', WP_DEBUG);
 
-    if ( true === $should_log ) {
+    if (true === $should_log) {
         $label = '';
-        if ( $file && $file !== '' ) {
-            $label .= basename( $file ) . ( $line ? '(' . $line . ')' : '' );
+        if ($file && $file !== '') {
+            $label .= basename($file) . ($line ? '(' . $line . ')' : '');
         }
 
-        if ( $title && $title !== '' ) {
+        if ($title && $title !== '') {
             $label = $label !== '' ? $label . ' ' : '';
             $label .= $title . ' ';
         }
 
-        $label = $label !== '' ? trim( $label ) . ' : ' : '';
+        $label = $label !== '' ? trim($label) . ' : ' : '';
 
-        if ( is_array( $log ) || is_object( $log ) ) {
-            error_log( $label . print_r( $log, true ) );
+        if (is_array($log) || is_object($log)) {
+            error_log($label . print_r($log, true));
         } else {
-            error_log( $label . $log );
+            error_log($label . $log);
         }
 
-        if ( $exit ) {
+        if ($exit) {
             exit;
         }
     }
@@ -663,65 +663,65 @@ 
 
 function wpinv_is_ajax_disabled() {
     $retval = false;
-    return apply_filters( 'wpinv_is_ajax_disabled', $retval );
+    return apply_filters('wpinv_is_ajax_disabled', $retval);
 }
 
-function wpinv_get_current_page_url( $nocache = false ) {
+function wpinv_get_current_page_url($nocache = false) {
     global $wp;
 
-    if ( get_option( 'permalink_structure' ) ) {
-        $base = trailingslashit( home_url( $wp->request ) );
+    if (get_option('permalink_structure')) {
+        $base = trailingslashit(home_url($wp->request));
     } else {
-        $base = add_query_arg( $wp->query_string, '', trailingslashit( home_url( $wp->request ) ) );
-        $base = remove_query_arg( array( 'post_type', 'name' ), $base );
+        $base = add_query_arg($wp->query_string, '', trailingslashit(home_url($wp->request)));
+        $base = remove_query_arg(array('post_type', 'name'), $base);
     }
 
     $scheme = is_ssl() ? 'https' : 'http';
-    $uri    = set_url_scheme( $base, $scheme );
+    $uri    = set_url_scheme($base, $scheme);
 
-    if ( is_front_page() ) {
-        $uri = home_url( '/' );
-    } elseif ( wpinv_is_checkout( array(), false ) ) {
+    if (is_front_page()) {
+        $uri = home_url('/');
+    } elseif (wpinv_is_checkout(array(), false)) {
         $uri = wpinv_get_checkout_uri();
     }
 
-    $uri = apply_filters( 'wpinv_get_current_page_url', $uri );
+    $uri = apply_filters('wpinv_get_current_page_url', $uri);
 
-    if ( $nocache ) {
-        $uri = wpinv_add_cache_busting( $uri );
+    if ($nocache) {
+        $uri = wpinv_add_cache_busting($uri);
     }
 
     return $uri;
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
-function wpinv_rgb_from_hex( $color ) {
-    $color = str_replace( '#', '', $color );
+function wpinv_rgb_from_hex($color) {
+    $color = str_replace('#', '', $color);
     // Convert shorthand colors to full format, e.g. "FFF" -> "FFFFFF"
-    $color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
+    $color = preg_replace('~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color);
 
     $rgb      = array();
-    $rgb['R'] = hexdec( $color{0}.$color{1} );
-    $rgb['G'] = hexdec( $color{2}.$color{3} );
-    $rgb['B'] = hexdec( $color{4}.$color{5} );
+    $rgb['R'] = hexdec($color{0} . $color{1} );
+    $rgb['G'] = hexdec($color{2} . $color{3} );
+    $rgb['B'] = hexdec($color{4} . $color{5} );
 
     return $rgb;
 }
 
-function wpinv_hex_darker( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_darker($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = $v / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v - $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -730,18 +730,18 @@ 
     return $color;
 }
 
-function wpinv_hex_lighter( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_lighter($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = 255 - $v;
         $amount      = $amount / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v + $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -750,22 +750,22 @@ 
     return $color;
 }
 
-function wpinv_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
-    $hex = str_replace( '#', '', $color );
+function wpinv_light_or_dark($color, $dark = '#000000', $light = '#FFFFFF') {
+    $hex = str_replace('#', '', $color);
 
-    $c_r = hexdec( substr( $hex, 0, 2 ) );
-    $c_g = hexdec( substr( $hex, 2, 2 ) );
-    $c_b = hexdec( substr( $hex, 4, 2 ) );
+    $c_r = hexdec(substr($hex, 0, 2));
+    $c_g = hexdec(substr($hex, 2, 2));
+    $c_b = hexdec(substr($hex, 4, 2));
 
-    $brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000;
+    $brightness = (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 
     return $brightness > 155 ? $dark : $light;
 }
 
-function wpinv_format_hex( $hex ) {
-    $hex = trim( str_replace( '#', '', $hex ) );
+function wpinv_format_hex($hex) {
+    $hex = trim(str_replace('#', '', $hex));
 
-    if ( strlen( $hex ) == 3 ) {
+    if (strlen($hex) == 3) {
         $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
     }
 
@@ -785,12 +785,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+function wpinv_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
+    if (function_exists('mb_strimwidth')) {
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
     }
 
-    return wpinv_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+    return wpinv_utf8_substr($str, $start, $width, $encoding) . $trimmaker;
 }
 
 /**
@@ -802,28 +802,28 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the number of characters in string.
  */
-function wpinv_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
+function wpinv_utf8_strlen($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        return mb_strlen($str, $encoding);
     }
 
-    return strlen( $str );
+    return strlen($str);
 }
 
-function wpinv_utf8_strtolower( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtolower' ) ) {
-        return mb_strtolower( $str, $encoding );
+function wpinv_utf8_strtolower($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtolower')) {
+        return mb_strtolower($str, $encoding);
     }
 
-    return strtolower( $str );
+    return strtolower($str);
 }
 
-function wpinv_utf8_strtoupper( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtoupper' ) ) {
-        return mb_strtoupper( $str, $encoding );
+function wpinv_utf8_strtoupper($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtoupper')) {
+        return mb_strtoupper($str, $encoding);
     }
 
-    return strtoupper( $str );
+    return strtoupper($str);
 }
 
 /**
@@ -837,12 +837,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the first occurrence of search in the string.
  */
-function wpinv_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strpos')) {
+        return mb_strpos($str, $find, $offset, $encoding);
     }
 
-    return strpos( $str, $find, $offset );
+    return strpos($str, $find, $offset);
 }
 
 /**
@@ -856,12 +856,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the last occurrence of search.
  */
-function wpinv_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strrpos')) {
+        return mb_strrpos($str, $find, $offset, $encoding);
     }
 
-    return strrpos( $str, $find, $offset );
+    return strrpos($str, $find, $offset);
 }
 
 /**
@@ -876,16 +876,16 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+function wpinv_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
+    if (function_exists('mb_substr')) {
+        if ($length === null) {
+            return mb_substr($str, $start, wpinv_utf8_strlen($str, $encoding), $encoding);
         } else {
-            return mb_substr( $str, $start, $length, $encoding );
+            return mb_substr($str, $start, $length, $encoding);
         }
     }
 
-    return substr( $str, $start, $length );
+    return substr($str, $start, $length);
 }
 
 /**
@@ -897,48 +897,48 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The width of string.
  */
-function wpinv_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strwidth' ) ) {
-        return mb_strwidth( $str, $encoding );
+function wpinv_utf8_strwidth($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strwidth')) {
+        return mb_strwidth($str, $encoding);
     }
 
-    return wpinv_utf8_strlen( $str, $encoding );
+    return wpinv_utf8_strlen($str, $encoding);
 }
 
-function wpinv_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = wpinv_utf8_strtoupper( wpinv_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+function wpinv_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        $first_letter = wpinv_utf8_strtoupper(wpinv_utf8_substr($str, 0, 1, $encoding), $encoding);
         $str_end = "";
 
-        if ( $lower_str_end ) {
-            $str_end = wpinv_utf8_strtolower( wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+        if ($lower_str_end) {
+            $str_end = wpinv_utf8_strtolower(wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding), $encoding);
         } else {
-            $str_end = wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+            $str_end = wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding);
         }
 
         return $first_letter . $str_end;
     }
 
-    return ucfirst( $str );
+    return ucfirst($str);
 }
 
-function wpinv_utf8_ucwords( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_convert_case' ) ) {
-        return mb_convert_case( $str, MB_CASE_TITLE, $encoding );
+function wpinv_utf8_ucwords($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_convert_case')) {
+        return mb_convert_case($str, MB_CASE_TITLE, $encoding);
     }
 
-    return ucwords( $str );
+    return ucwords($str);
 }
 
-function wpinv_period_in_days( $period, $unit ) {
-    $period = absint( $period );
+function wpinv_period_in_days($period, $unit) {
+    $period = absint($period);
 
-    if ( $period > 0 ) {
-        if ( in_array( strtolower( $unit ), array( 'w', 'week', 'weeks' ) ) ) {
+    if ($period > 0) {
+        if (in_array(strtolower($unit), array('w', 'week', 'weeks'))) {
             $period = $period * 7;
-        } else if ( in_array( strtolower( $unit ), array( 'm', 'month', 'months' ) ) ) {
+        } else if (in_array(strtolower($unit), array('m', 'month', 'months'))) {
             $period = $period * 30;
-        } else if ( in_array( strtolower( $unit ), array( 'y', 'year', 'years' ) ) ) {
+        } else if (in_array(strtolower($unit), array('y', 'year', 'years'))) {
             $period = $period * 365;
         }
     }
@@ -946,10 +946,10 @@ 
     return $period;
 }
 
-if ( ! function_exists( 'cal_days_in_month' ) ) {
+if (!function_exists('cal_days_in_month')) {
     // Fallback in case the calendar extension is not loaded in PHP
     // Only supports Gregorian calendar
-    function cal_days_in_month( $calendar, $month, $year ) {
-        return date( 't', mktime( 0, 0, 0, $month, 1, $year ) );
+    function cal_days_in_month($calendar, $month, $year) {
+        return date('t', mktime(0, 0, 0, $month, 1, $year));
     }
 }
\ No newline at end of file

includes/class-wpinv-subscriptions-db.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 /**
  * The Subscriptions DB Class

Spacing +155 added lines, -155 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * The Subscriptions DB Class
@@ -68,8 +68,8 @@ 
             'transaction_id'    => '',
             'parent_payment_id' => 0,
             'product_id'        => 0,
-            'created'           => date( 'Y-m-d H:i:s' ),
-            'expiration'        => date( 'Y-m-d H:i:s' ),
+            'created'           => date('Y-m-d H:i:s'),
+            'expiration'        => date('Y-m-d H:i:s'),
             'trial_period'      => '',
             'status'            => '',
             'profile_id'        => '',
@@ -82,11 +82,11 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function get_subscriptions( $args = array() ) {
+    public function get_subscriptions($args = array()) {
         global $wpdb;
 
         $defaults = array(
-            'number'       => get_option( 'posts_per_page' ),
+            'number'       => get_option('posts_per_page'),
             'offset'       => 0,
             'search'       => '',
             'customer_id'  => 0,
@@ -94,21 +94,21 @@ 
             'order'        => 'DESC'
         );
 
-        $args  = wp_parse_args( $args, $defaults );
+        $args = wp_parse_args($args, $defaults);
 
-        if( $args['number'] < 1 ) {
+        if ($args['number'] < 1) {
             $args['number'] = 999999999999;
         }
 
         $where = ' WHERE 1=1 ';
 
         // specific customers
-        if( ! empty( $args['id'] ) ) {
+        if (!empty($args['id'])) {
 
-            if( is_array( $args['id'] ) ) {
-                $ids = implode( ',', array_map('intval', $args['id'] ) );
+            if (is_array($args['id'])) {
+                $ids = implode(',', array_map('intval', $args['id']));
             } else {
-                $ids = intval( $args['id'] );
+                $ids = intval($args['id']);
             }
 
             $where .= " AND `id` IN( {$ids} ) ";
@@ -116,12 +116,12 @@ 
         }
 
         // Specific products
-        if( ! empty( $args['product_id'] ) ) {
+        if (!empty($args['product_id'])) {
 
-            if( is_array( $args['product_id'] ) ) {
-                $product_ids = implode( ',', array_map('intval', $args['product_id'] ) );
+            if (is_array($args['product_id'])) {
+                $product_ids = implode(',', array_map('intval', $args['product_id']));
             } else {
-                $product_ids = intval( $args['product_id'] );
+                $product_ids = intval($args['product_id']);
             }
 
             $where .= " AND `product_id` IN( {$product_ids} ) ";
@@ -129,12 +129,12 @@ 
         }
 
         // Specific parent payments
-        if( ! empty( $args['parent_payment_id'] ) ) {
+        if (!empty($args['parent_payment_id'])) {
 
-            if( is_array( $args['parent_payment_id'] ) ) {
-                $parent_payment_ids = implode( ',', array_map('intval', $args['parent_payment_id'] ) );
+            if (is_array($args['parent_payment_id'])) {
+                $parent_payment_ids = implode(',', array_map('intval', $args['parent_payment_id']));
             } else {
-                $parent_payment_ids = intval( $args['parent_payment_id'] );
+                $parent_payment_ids = intval($args['parent_payment_id']);
             }
 
             $where .= " AND `parent_payment_id` IN( {$parent_payment_ids} ) ";
@@ -142,12 +142,12 @@ 
         }
 
         // Specific transaction IDs
-        if( ! empty( $args['transaction_id'] ) ) {
+        if (!empty($args['transaction_id'])) {
 
-            if( is_array( $args['transaction_id'] ) ) {
-                $transaction_ids = implode( "','", array_map('sanitize_text_field', $args['transaction_id'] ) );
+            if (is_array($args['transaction_id'])) {
+                $transaction_ids = implode("','", array_map('sanitize_text_field', $args['transaction_id']));
             } else {
-                $transaction_ids = sanitize_text_field( $args['transaction_id'] );
+                $transaction_ids = sanitize_text_field($args['transaction_id']);
             }
 
             $where .= " AND `transaction_id` IN ( '{$transaction_ids}' ) ";
@@ -155,12 +155,12 @@ 
         }
 
         // Subscriptoins for specific customers
-        if( ! empty( $args['customer_id'] ) ) {
+        if (!empty($args['customer_id'])) {
 
-            if( is_array( $args['customer_id'] ) ) {
-                $customer_ids = implode( ',', array_map('intval', $args['customer_id'] ) );
+            if (is_array($args['customer_id'])) {
+                $customer_ids = implode(',', array_map('intval', $args['customer_id']));
             } else {
-                $customer_ids = intval( $args['customer_id'] );
+                $customer_ids = intval($args['customer_id']);
             }
 
             $where .= " AND `customer_id` IN( {$customer_ids} ) ";
@@ -168,12 +168,12 @@ 
         }
 
         // Subscriptions for specific profile IDs
-        if( ! empty( $args['profile_id'] ) ) {
+        if (!empty($args['profile_id'])) {
 
-            if( is_array( $args['profile_id'] ) ) {
-                $profile_ids = implode( "','", array_map('sanitize_text_field', $args['profile_id'] ) );
+            if (is_array($args['profile_id'])) {
+                $profile_ids = implode("','", array_map('sanitize_text_field', $args['profile_id']));
             } else {
-                $profile_ids = sanitize_text_field( $args['profile_id'] );
+                $profile_ids = sanitize_text_field($args['profile_id']);
             }
 
             $where .= " AND `profile_id` IN( '{$profile_ids}' ) ";
@@ -181,12 +181,12 @@ 
         }
 
         // Subscriptions for specific statuses
-        if( ! empty( $args['status'] ) ) {
+        if (!empty($args['status'])) {
 
-            if( is_array( $args['status'] ) ) {
-                $statuses = implode( "','", array_map( 'sanitize_text_field', $args['status'] ) );
+            if (is_array($args['status'])) {
+                $statuses = implode("','", array_map('sanitize_text_field', $args['status']));
             } else {
-                $statuses = sanitize_text_field( $args['status'] );
+                $statuses = sanitize_text_field($args['status']);
             }
 
             $where .= " AND `status` IN( '{$statuses}' ) ";
@@ -194,21 +194,21 @@ 
         }
 
         // Subscriptions created for a specific date or in a date range
-        if( ! empty( $args['date'] ) ) {
+        if (!empty($args['date'])) {
 
-            if( is_array( $args['date'] ) ) {
+            if (is_array($args['date'])) {
 
-                if( ! empty( $args['date']['start'] ) ) {
+                if (!empty($args['date']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
 
                     $where .= " AND `created` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['date']['end'] ) ) {
+                if (!empty($args['date']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
                     $where .= " AND `created` <= '{$end}'";
 
@@ -216,9 +216,9 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['date'] ) );
-                $month = date( 'm', strtotime( $args['date'] ) );
-                $day   = date( 'd', strtotime( $args['date'] ) );
+                $year  = date('Y', strtotime($args['date']));
+                $month = date('m', strtotime($args['date']));
+                $day   = date('d', strtotime($args['date']));
 
                 $where .= " AND $year = YEAR ( created ) AND $month = MONTH ( created ) AND $day = DAY ( created )";
             }
@@ -226,21 +226,21 @@ 
         }
 
         // Subscriptions with a specific expiration date or in an expiration date range
-        if( ! empty( $args['expiration'] ) ) {
+        if (!empty($args['expiration'])) {
 
-            if( is_array( $args['expiration'] ) ) {
+            if (is_array($args['expiration'])) {
 
-                if( ! empty( $args['expiration']['start'] ) ) {
+                if (!empty($args['expiration']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['expiration']['start']));
 
                     $where .= " AND `expiration` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['expiration']['end'] ) ) {
+                if (!empty($args['expiration']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['expiration']['end']));
 
                     $where .= " AND `expiration` <= '{$end}'";
 
@@ -248,73 +248,73 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['expiration'] ) );
-                $month = date( 'm', strtotime( $args['expiration'] ) );
-                $day   = date( 'd', strtotime( $args['expiration'] ) );
+                $year  = date('Y', strtotime($args['expiration']));
+                $month = date('m', strtotime($args['expiration']));
+                $day   = date('d', strtotime($args['expiration']));
 
                 $where .= " AND $year = YEAR ( expiration ) AND $month = MONTH ( expiration ) AND $day = DAY ( expiration )";
             }
 
         }
 
-        if ( ! empty( $args['search'] ) ) {
+        if (!empty($args['search'])) {
 
-            if( false !== strpos( 'id:', $args['search'] ) ) {
+            if (false !== strpos('id:', $args['search'])) {
 
-                $args['search'] = trim( str_replace( 'id:', '', $args['search'] ) );
-                $where .= " AND `id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('id:', '', $args['search']));
+                $where .= " AND `id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'txn:' ) ) {
+            } else if (false !== strpos($args['search'], 'txn:')) {
 
-                $args['search'] = trim( str_replace( 'txn:', '', $args['search'] ) );
-                $where .= " AND `transaction_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('txn:', '', $args['search']));
+                $where .= " AND `transaction_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'profile_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'profile_id:')) {
 
-                $args['search'] = trim( str_replace( 'profile_id:', '', $args['search'] ) );
-                $where .= " AND `profile_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('profile_id:', '', $args['search']));
+                $where .= " AND `profile_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'product_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'product_id:')) {
 
-                $args['search'] = trim( str_replace( 'product_id:', '', $args['search'] ) );
-                $where .= " AND `product_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('product_id:', '', $args['search']));
+                $where .= " AND `product_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'customer_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'customer_id:')) {
 
-                $args['search'] = trim( str_replace( 'customer_id:', '', $args['search'] ) );
-                $where .= " AND `customer_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('customer_id:', '', $args['search']));
+                $where .= " AND `customer_id` = '" . esc_sql($args['search']) . "'";
 
             } else {
 
-                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `profile_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `transaction_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `product_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `id` = '" . esc_sql( $args['search'] ) . "' )";
+                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `profile_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `transaction_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `product_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `id` = '" . esc_sql($args['search']) . "' )";
 
             }
 
         }
 
-        $args['orderby'] = ! array_key_exists( $args['orderby'], $this->get_columns() ) ? 'id' : $args['orderby'];
+        $args['orderby'] = !array_key_exists($args['orderby'], $this->get_columns()) ? 'id' : $args['orderby'];
 
-        if( 'amount' == $args['orderby'] ) {
+        if ('amount' == $args['orderby']) {
             $args['orderby'] = 'amount+0';
         }
 
-        $cache_key = md5( 'wpinv_subscriptions_' . serialize( $args ) );
+        $cache_key = md5('wpinv_subscriptions_' . serialize($args));
 
-        $subscriptions = wp_cache_get( $cache_key, 'subscriptions' );
+        $subscriptions = wp_cache_get($cache_key, 'subscriptions');
 
-        $args['orderby'] = esc_sql( $args['orderby'] );
-        $args['order']   = esc_sql( $args['order'] );
+        $args['orderby'] = esc_sql($args['orderby']);
+        $args['order']   = esc_sql($args['order']);
 
-        if( $subscriptions === false ) {
-            $subscriptions = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint( $args['offset'] ), absint( $args['number'] ) ), OBJECT );
+        if ($subscriptions === false) {
+            $subscriptions = $wpdb->get_results($wpdb->prepare("SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint($args['offset']), absint($args['number'])), OBJECT);
 
-            if( ! empty( $subscriptions ) ) {
+            if (!empty($subscriptions)) {
 
-                foreach( $subscriptions as $key => $subscription ) {
-                    $subscriptions[ $key ] = new WPInv_Subscription( $subscription );
+                foreach ($subscriptions as $key => $subscription) {
+                    $subscriptions[$key] = new WPInv_Subscription($subscription);
                 }
 
-                wp_cache_set( $cache_key, $subscriptions, 'subscriptions', 3600 );
+                wp_cache_set($cache_key, $subscriptions, 'subscriptions', 3600);
 
             }
 
@@ -329,19 +329,19 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function count( $args = array() ) {
+    public function count($args = array()) {
 
         global $wpdb;
 
         $where = ' WHERE 1=1 ';
 
         // specific customers
-        if( ! empty( $args['id'] ) ) {
+        if (!empty($args['id'])) {
 
-            if( is_array( $args['id'] ) ) {
-                $ids = implode( ',', array_map('intval', $args['id'] ) );
+            if (is_array($args['id'])) {
+                $ids = implode(',', array_map('intval', $args['id']));
             } else {
-                $ids = intval( $args['id'] );
+                $ids = intval($args['id']);
             }
 
             $where .= " AND `id` IN( {$ids} ) ";
@@ -349,12 +349,12 @@ 
         }
 
         // Specific products
-        if( ! empty( $args['product_id'] ) ) {
+        if (!empty($args['product_id'])) {
 
-            if( is_array( $args['product_id'] ) ) {
-                $product_ids = implode( ',', array_map('intval', $args['product_id'] ) );
+            if (is_array($args['product_id'])) {
+                $product_ids = implode(',', array_map('intval', $args['product_id']));
             } else {
-                $product_ids = intval( $args['product_id'] );
+                $product_ids = intval($args['product_id']);
             }
 
             $where .= " AND `product_id` IN( {$product_ids} ) ";
@@ -362,12 +362,12 @@ 
         }
 
         // Specific parent payments
-        if( ! empty( $args['parent_payment_id'] ) ) {
+        if (!empty($args['parent_payment_id'])) {
 
-            if( is_array( $args['parent_payment_id'] ) ) {
-                $parent_payment_ids = implode( ',', array_map('intval', $args['parent_payment_id'] ) );
+            if (is_array($args['parent_payment_id'])) {
+                $parent_payment_ids = implode(',', array_map('intval', $args['parent_payment_id']));
             } else {
-                $parent_payment_ids = intval( $args['parent_payment_id'] );
+                $parent_payment_ids = intval($args['parent_payment_id']);
             }
 
             $where .= " AND `parent_payment_id` IN( {$parent_payment_ids} ) ";
@@ -375,12 +375,12 @@ 
         }
 
         // Subscriptoins for specific customers
-        if( ! empty( $args['customer_id'] ) ) {
+        if (!empty($args['customer_id'])) {
 
-            if( is_array( $args['customer_id'] ) ) {
-                $customer_ids = implode( ',', array_map('intval', $args['customer_id'] ) );
+            if (is_array($args['customer_id'])) {
+                $customer_ids = implode(',', array_map('intval', $args['customer_id']));
             } else {
-                $customer_ids = intval( $args['customer_id'] );
+                $customer_ids = intval($args['customer_id']);
             }
 
             $where .= " AND `customer_id` IN( {$customer_ids} ) ";
@@ -388,12 +388,12 @@ 
         }
 
         // Subscriptions for specific profile IDs
-        if( ! empty( $args['profile_id'] ) ) {
+        if (!empty($args['profile_id'])) {
 
-            if( is_array( $args['profile_id'] ) ) {
-                $profile_ids = implode( ',', array_map('intval', $args['profile_id'] ) );
+            if (is_array($args['profile_id'])) {
+                $profile_ids = implode(',', array_map('intval', $args['profile_id']));
             } else {
-                $profile_ids = intval( $args['profile_id'] );
+                $profile_ids = intval($args['profile_id']);
             }
 
             $where .= " AND `profile_id` IN( {$profile_ids} ) ";
@@ -401,12 +401,12 @@ 
         }
 
         // Specific transaction IDs
-        if( ! empty( $args['transaction_id'] ) ) {
+        if (!empty($args['transaction_id'])) {
 
-            if( is_array( $args['transaction_id'] ) ) {
-                $transaction_ids = implode( ',', array_map('sanitize_text_field', $args['transaction_id'] ) );
+            if (is_array($args['transaction_id'])) {
+                $transaction_ids = implode(',', array_map('sanitize_text_field', $args['transaction_id']));
             } else {
-                $transaction_ids = sanitize_text_field( $args['transaction_id'] );
+                $transaction_ids = sanitize_text_field($args['transaction_id']);
             }
 
             $where .= " AND `transaction_id` IN( {$transaction_ids} ) ";
@@ -414,10 +414,10 @@ 
         }
 
         // Subscriptions for specific statuses
-        if( ! empty( $args['status'] ) ) {
+        if (!empty($args['status'])) {
 
-            if( is_array( $args['status'] ) ) {
-                $statuses = implode( ',', $args['status'] );
+            if (is_array($args['status'])) {
+                $statuses = implode(',', $args['status']);
                 $where  .= " AND `status` IN( {$statuses} ) ";
             } else {
                 $statuses = $args['status'];
@@ -429,21 +429,21 @@ 
         }
 
         // Subscriptions created for a specific date or in a date range
-        if( ! empty( $args['date'] ) ) {
+        if (!empty($args['date'])) {
 
-            if( is_array( $args['date'] ) ) {
+            if (is_array($args['date'])) {
 
-                if( ! empty( $args['date']['start'] ) ) {
+                if (!empty($args['date']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
 
                     $where .= " AND `created` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['date']['end'] ) ) {
+                if (!empty($args['date']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
                     $where .= " AND `created` <= '{$end}'";
 
@@ -451,9 +451,9 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['date'] ) );
-                $month = date( 'm', strtotime( $args['date'] ) );
-                $day   = date( 'd', strtotime( $args['date'] ) );
+                $year  = date('Y', strtotime($args['date']));
+                $month = date('m', strtotime($args['date']));
+                $day   = date('d', strtotime($args['date']));
 
                 $where .= " AND $year = YEAR ( created ) AND $month = MONTH ( created ) AND $day = DAY ( created )";
             }
@@ -461,21 +461,21 @@ 
         }
 
         // Subscriptions with a specific expiration date or in an expiration date range
-        if( ! empty( $args['expiration'] ) ) {
+        if (!empty($args['expiration'])) {
 
-            if( is_array( $args['expiration'] ) ) {
+            if (is_array($args['expiration'])) {
 
-                if( ! empty( $args['expiration']['start'] ) ) {
+                if (!empty($args['expiration']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['expiration']['start']));
 
                     $where .= " AND `expiration` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['expiration']['end'] ) ) {
+                if (!empty($args['expiration']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['expiration']['end']));
 
                     $where .= " AND `expiration` <= '{$end}'";
 
@@ -483,64 +483,64 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['expiration'] ) );
-                $month = date( 'm', strtotime( $args['expiration'] ) );
-                $day   = date( 'd', strtotime( $args['expiration'] ) );
+                $year  = date('Y', strtotime($args['expiration']));
+                $month = date('m', strtotime($args['expiration']));
+                $day   = date('d', strtotime($args['expiration']));
 
                 $where .= " AND $year = YEAR ( expiration ) AND $month = MONTH ( expiration ) AND $day = DAY ( expiration )";
             }
 
         }
 
-        if ( ! empty( $args['search'] ) ) {
+        if (!empty($args['search'])) {
 
-            if( false !== strpos( 'id:', $args['search'] ) ) {
+            if (false !== strpos('id:', $args['search'])) {
 
-                $args['search'] = trim( str_replace( 'id:', '', $args['search'] ) );
-                $where .= " AND `id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('id:', '', $args['search']));
+                $where .= " AND `id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'txn:' ) ) {
+            } else if (false !== strpos($args['search'], 'txn:')) {
 
-                $args['search'] = trim( str_replace( 'txn:', '', $args['search'] ) );
-                $where .= " AND `transaction_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('txn:', '', $args['search']));
+                $where .= " AND `transaction_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'profile_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'profile_id:')) {
 
-                $args['search'] = trim( str_replace( 'profile_id:', '', $args['search'] ) );
-                $where .= " AND `profile_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('profile_id:', '', $args['search']));
+                $where .= " AND `profile_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'product_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'product_id:')) {
 
-                $args['search'] = trim( str_replace( 'product_id:', '', $args['search'] ) );
-                $where .= " AND `product_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('product_id:', '', $args['search']));
+                $where .= " AND `product_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'customer_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'customer_id:')) {
 
-                $args['search'] = trim( str_replace( 'customer_id:', '', $args['search'] ) );
-                $where .= " AND `customer_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('customer_id:', '', $args['search']));
+                $where .= " AND `customer_id` = '" . esc_sql($args['search']) . "'";
 
             } else {
 
-                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `profile_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `transaction_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `product_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `id` = '" . esc_sql( $args['search'] ) . "' )";
+                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `profile_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `transaction_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `product_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `id` = '" . esc_sql($args['search']) . "' )";
 
             }
 
         }
 
-        $cache_key = md5( 'wpinv_subscriptions_count' . serialize( $args ) );
+        $cache_key = md5('wpinv_subscriptions_count' . serialize($args));
 
-        $count = wp_cache_get( $cache_key, 'subscriptions' );
+        $count = wp_cache_get($cache_key, 'subscriptions');
 
-        if( $count === false ) {
+        if ($count === false) {
 
             $sql   = "SELECT COUNT($this->primary_key) FROM " . $this->table_name . "{$where};";
-            $count = $wpdb->get_var( $sql );
+            $count = $wpdb->get_var($sql);
 
-            wp_cache_set( $cache_key, $count, 'subscriptions', 3600 );
+            wp_cache_set($cache_key, $count, 'subscriptions', 3600);
 
         }
 
-        return absint( $count );
+        return absint($count);
 
     }
 
@@ -554,7 +554,7 @@ 
 
         global $wpdb;
 
-        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
         $sql = "CREATE TABLE " . $this->table_name . " (
 		id bigint(20) NOT NULL AUTO_INCREMENT,
@@ -579,10 +579,10 @@ 
 		KEY customer_and_status ( customer_id, status)
 		) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-        dbDelta( $sql );
+        dbDelta($sql);
 
-        update_option( $this->table_name . '_wpinv_db_version', $this->version );
-        update_option( 'wpinv_db_version', WPINV_VERSION );
+        update_option($this->table_name . '_wpinv_db_version', $this->version);
+        update_option('wpinv_db_version', WPINV_VERSION);
     }
 
 }
\ No newline at end of file

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

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 
 // Load WP_List_Table if not loaded

Indentation +349 added lines, -349 removed lines

@@ -13,7 +13,7 @@ 
 
 // Load WP_List_Table if not loaded
 if( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -23,102 +23,102 @@ 
  */
 class WPInv_Subscription_Reports_Table extends WP_List_Table {
 
-	/**
-	 * Number of results to show per page
-	 *
-	 * @since       1.0.0
-	 */
-
-	public $per_page        = 30;
-	public $total_count     = 0;
-	public $active_count    = 0;
-	public $pending_count   = 0;
-	public $expired_count   = 0;
-	public $completed_count = 0;
-	public $trialling_count  = 0;
-	public $cancelled_count = 0;
-	public $failing_count   = 0;
-
-	/**
-	 * Get things started
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      void
-	 */
-	function __construct(){
-		global $status, $page;
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular'  => 'subscription',
-			'plural'    => 'subscriptions',
-			'ajax'      => false
-		) );
-
-		$this->get_subscription_counts();
-
-	}
-
-	/**
-	 * Retrieve the view types
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return array $views All the views available
-	 */
-	public function get_views() {
-
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
-		$active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
-		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
-		$completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
-		$trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
-		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
-
-		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
-			'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
-			'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
-			'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
-			'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
-			'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
-		);
-
-		return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
-	}
-
-	/**
-	 * Show the search field
-	 *
-	 * @since 2.5
-	 * @access public
-	 *
-	 * @param string $text Label for the search box
-	 * @param string $input_id ID of the search box
-	 *
-	 * @return void
-	 */
-	public function search_box( $text, $input_id ) {
-
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
-			return;
-		}
-
-		$input_id = $input_id . '-search-input';
-
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		}
-
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		}
+    /**
+     * Number of results to show per page
+     *
+     * @since       1.0.0
+     */
+
+    public $per_page        = 30;
+    public $total_count     = 0;
+    public $active_count    = 0;
+    public $pending_count   = 0;
+    public $expired_count   = 0;
+    public $completed_count = 0;
+    public $trialling_count  = 0;
+    public $cancelled_count = 0;
+    public $failing_count   = 0;
+
+    /**
+     * Get things started
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      void
+     */
+    function __construct(){
+        global $status, $page;
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular'  => 'subscription',
+            'plural'    => 'subscriptions',
+            'ajax'      => false
+        ) );
+
+        $this->get_subscription_counts();
+
+    }
+
+    /**
+     * Retrieve the view types
+     *
+     * @access public
+     * @since 1.0.0
+     * @return array $views All the views available
+     */
+    public function get_views() {
+
+        $current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
+        $total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
+        $active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
+        $pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
+        $expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
+        $completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
+        $trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
+        $cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
+        $failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
+
+        $views = array(
+            'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
+            'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
+            'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
+            'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
+            'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
+            'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
+            'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
+            'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
+        );
+
+        return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
+    }
+
+    /**
+     * Show the search field
+     *
+     * @since 2.5
+     * @access public
+     *
+     * @param string $text Label for the search box
+     * @param string $input_id ID of the search box
+     *
+     * @return void
+     */
+    public function search_box( $text, $input_id ) {
+
+        if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+            return;
+        }
+
+        $input_id = $input_id . '-search-input';
+
+        if ( ! empty( $_REQUEST['orderby'] ) ) {
+            echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+        }
+
+        if ( ! empty( $_REQUEST['order'] ) ) {
+            echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+        }
 ?>
 		<p class="search-box">
 			<?php do_action( 'wpinv_recurring_subscription_search_box' ); ?>
@@ -127,18 +127,18 @@ 
 			<?php submit_button( $text, 'button', false, false, array('ID' => 'search-submit') ); ?><br/>
 		</p>
 <?php
-	}
-
-	/**
-	 * Render most columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_default( $item, $column_name ) {
-		return $item->$column_name;
-	}
+    }
+
+    /**
+     * Render most columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_default( $item, $column_name ) {
+        return $item->$column_name;
+    }
 
     /**
      * Subscription id column
@@ -151,244 +151,244 @@ 
         return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" target="_blank">' . $item->id . '</a>';
     }
 
-	/**
-	 * Customer column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_customer_id( $item ) {
-		$subscriber = get_userdata( $item->customer_id );
-		$customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
-
-		return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
-	}
-
-	/**
-	 * Status column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_status( $item ) {
-		return $item->get_status_label();
-	}
-
-	/**
-	 * Period column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_period( $item ) {
-
-		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
-
-		return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
-	}
-
-	/**
-	 * Billing Times column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_bill_times( $item ) {
-		return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
-	}
-
-	/**
-	 * Initial Amount column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_initial_amount( $item ) {
-		return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
-	}
-
-	/**
-	 * Renewal date column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_renewal_date( $item ) {
-		return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
-	}
-
-	/**
-	 * Payment column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_parent_payment_id( $item ) {
-		return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . $item->parent_payment_id . '</a>';
-	}
-
-	/**
-	 * Product ID column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_product_id( $item ) {
-		return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
-	}
-
-	/**
-	 * Render the edit column
-	 *
-	 * @access      private
-	 * @since       2.0
-	 * @return      string
-	 */
-	function column_actions( $item ) {
-		return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
-	}
-
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      array
-	 */
-
-	function get_columns(){
-		$columns = array(
-			'sub_id'            => __( 'ID', 'invoicing' ),
-			'customer_id'       => __( 'Customer', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'period'            => __( 'Billing Cycle', 'invoicing' ),
-			'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
-			'bill_times'        => __( 'Times Billed', 'invoicing' ),
-			'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
-			'parent_payment_id' => __( 'Invoice', 'invoicing' ),
-			'product_id'        => __( 'Item', 'invoicing' ),
-			'actions'           => __( 'Actions', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpinv_report_subscription_columns', $columns );
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      int
-	 */
-	function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Retrieve the subscription counts
-	 *
-	 * @access public
-	 * @since 1.4
-	 * @return void
-	 */
-	public function get_subscription_counts() {
-
-		global $wp_query;
-
-		$db = new WPInv_Subscriptions_DB;
-
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-
-		$this->total_count     = $db->count();
-		$this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
-		$this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
-		$this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
-		$this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
-		$this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
-		$this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
-		$this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @uses        $this->_column_headers
-	 * @uses        $this->items
-	 * @uses        $this->get_columns()
-	 * @uses        $this->get_sortable_columns()
-	 * @uses        $this->get_pagenum()
-	 * @uses        $this->set_pagination_args()
-	 * @return      array
-	 */
-	function prepare_items() {
-
-		$columns  = $this->get_columns();
-		$hidden   = array(); // No hidden columns
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
-		$sortable = $this->get_sortable_columns();
-
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		$current_page = $this->get_pagenum();
-
-		$db     = new WPInv_Subscriptions_DB;
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-		$args   = array(
-			'number' => $this->per_page,
-			'offset' => $this->per_page * ( $this->get_paged() - 1 ),
-			'search' => $search
-		);
-
-		if ( 'any' !== $status ) {
-			$args['status'] = $status;
-		}
-
-		$this->items = $db->get_subscriptions( $args );
-
-		switch ( $status ) {
-			case 'active':
-				$total_items = $this->active_count;
-				break;
-			case 'pending':
-				$total_items = $this->pending_count;
-				break;
-			case 'expired':
-				$total_items = $this->expired_count;
-				break;
-			case 'cancelled':
-				$total_items = $this->cancelled_count;
-				break;
-			case 'failing':
-				$total_items = $this->failing_count;
-				break;
-			case 'trialling':
-				$total_items = $this->trialling_count;
-				break;
-			case 'completed':
-				$total_items = $this->completed_count;
-				break;
-			case 'any':
-			default:
-				$total_items = $this->total_count;
-				break;
-		}
-
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,
-			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page )
-		) );
-	}
+    /**
+     * Customer column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_customer_id( $item ) {
+        $subscriber = get_userdata( $item->customer_id );
+        $customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
+
+        return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
+    }
+
+    /**
+     * Status column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_status( $item ) {
+        return $item->get_status_label();
+    }
+
+    /**
+     * Period column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_period( $item ) {
+
+        $period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
+
+        return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
+    }
+
+    /**
+     * Billing Times column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_bill_times( $item ) {
+        return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
+    }
+
+    /**
+     * Initial Amount column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_initial_amount( $item ) {
+        return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
+    }
+
+    /**
+     * Renewal date column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_renewal_date( $item ) {
+        return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
+    }
+
+    /**
+     * Payment column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_parent_payment_id( $item ) {
+        return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . $item->parent_payment_id . '</a>';
+    }
+
+    /**
+     * Product ID column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_product_id( $item ) {
+        return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
+    }
+
+    /**
+     * Render the edit column
+     *
+     * @access      private
+     * @since       2.0
+     * @return      string
+     */
+    function column_actions( $item ) {
+        return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
+    }
+
+
+    /**
+     * Retrieve the table columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      array
+     */
+
+    function get_columns(){
+        $columns = array(
+            'sub_id'            => __( 'ID', 'invoicing' ),
+            'customer_id'       => __( 'Customer', 'invoicing' ),
+            'status'            => __( 'Status', 'invoicing' ),
+            'period'            => __( 'Billing Cycle', 'invoicing' ),
+            'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
+            'bill_times'        => __( 'Times Billed', 'invoicing' ),
+            'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
+            'parent_payment_id' => __( 'Invoice', 'invoicing' ),
+            'product_id'        => __( 'Item', 'invoicing' ),
+            'actions'           => __( 'Actions', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpinv_report_subscription_columns', $columns );
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      int
+     */
+    function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Retrieve the subscription counts
+     *
+     * @access public
+     * @since 1.4
+     * @return void
+     */
+    public function get_subscription_counts() {
+
+        global $wp_query;
+
+        $db = new WPInv_Subscriptions_DB;
+
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+
+        $this->total_count     = $db->count();
+        $this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
+        $this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
+        $this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
+        $this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
+        $this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
+        $this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
+        $this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @access      private
+     * @since       1.0.0
+     * @uses        $this->_column_headers
+     * @uses        $this->items
+     * @uses        $this->get_columns()
+     * @uses        $this->get_sortable_columns()
+     * @uses        $this->get_pagenum()
+     * @uses        $this->set_pagination_args()
+     * @return      array
+     */
+    function prepare_items() {
+
+        $columns  = $this->get_columns();
+        $hidden   = array(); // No hidden columns
+        $status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+        $sortable = $this->get_sortable_columns();
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        $current_page = $this->get_pagenum();
+
+        $db     = new WPInv_Subscriptions_DB;
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+        $args   = array(
+            'number' => $this->per_page,
+            'offset' => $this->per_page * ( $this->get_paged() - 1 ),
+            'search' => $search
+        );
+
+        if ( 'any' !== $status ) {
+            $args['status'] = $status;
+        }
+
+        $this->items = $db->get_subscriptions( $args );
+
+        switch ( $status ) {
+            case 'active':
+                $total_items = $this->active_count;
+                break;
+            case 'pending':
+                $total_items = $this->pending_count;
+                break;
+            case 'expired':
+                $total_items = $this->expired_count;
+                break;
+            case 'cancelled':
+                $total_items = $this->cancelled_count;
+                break;
+            case 'failing':
+                $total_items = $this->failing_count;
+                break;
+            case 'trialling':
+                $total_items = $this->trialling_count;
+                break;
+            case 'completed':
+                $total_items = $this->completed_count;
+                break;
+            case 'any':
+            default:
+                $total_items = $this->total_count;
+                break;
+        }
+
+        $this->set_pagination_args( array(
+            'total_items' => $total_items,
+            'per_page'    => $this->per_page,
+            'total_pages' => ceil( $total_items / $this->per_page )
+        ) );
+    }
 }

Spacing +83 added lines, -83 removed lines

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

includes/admin/subscriptions.php

Braces +10 added lines, -4 removed lines

@@ -179,8 +179,11 @@ 
 											<label for="tablecell">
 												<?php if( 'trialling' == $sub->status ) : ?>
 													<?php _e( 'Trialling Until:', 'invoicing' ); ?>
-												<?php else: ?>
-													<?php _e( 'Expiration Date:', 'invoicing' ); ?>
+												<?php else {
+    : ?>
+													<?php _e( 'Expiration Date:', 'invoicing' );
+}
+?>
 												<?php endif; ?>
 											</label>
 										</td>
@@ -268,9 +271,12 @@ 
 									</td>
 								</tr>
 							<?php endforeach; ?>
-						<?php else: ?>
+						<?php else {
+    : ?>
 							<tr>
-								<td colspan="5"><?php _e( 'No Invoices Found.', 'invoicing' ); ?></td>
+								<td colspan="5"><?php _e( 'No Invoices Found.', 'invoicing' );
+}
+?></td>
 							</tr>
 						<?php endif; ?>
 						</tbody>

Indentation +83 added lines, -83 removed lines

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

Spacing +115 added lines, -115 removed lines

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

includes/class-wpinv-subscriptions.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 function wpinv_subscription_init() {
     return WPInv_Subscriptions::instance();

Spacing +68 added lines, -68 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 function wpinv_subscription_init() {
     return WPInv_Subscriptions::instance();
 }
-add_action( 'plugins_loaded', 'wpinv_subscription_init', 100 );
+add_action('plugins_loaded', 'wpinv_subscription_init', 100);
 
 /**
  * WPInv_Subscriptions Class.
@@ -20,7 +20,7 @@ 
      * Main WPInv_Subscriptions Instance
      */
     public static function instance() {
-        if ( ! isset( self::$instance ) ) {
+        if (!isset(self::$instance)) {
             self::$instance = new WPInv_Subscriptions;
 
             self::$instance->init();
@@ -34,7 +34,7 @@ 
      *
      * @since 1.0.0
      */
-    private function __construct(){
+    private function __construct() {
 
     }
 
@@ -63,8 +63,8 @@ 
     private function setup_constants() {
 
         // Make sure CAL_GREGORIAN is defined.
-        if ( ! defined( 'CAL_GREGORIAN' ) ) {
-            define( 'CAL_GREGORIAN', 1 );
+        if (!defined('CAL_GREGORIAN')) {
+            define('CAL_GREGORIAN', 1);
         }
     }
 
@@ -76,13 +76,13 @@ 
      */
     private function actions() {
 
-        add_action( 'admin_menu', array( $this, 'wpinv_subscriptions_list' ), 10 );
-        add_action( 'admin_notices', array( $this, 'notices' ) );
-        add_action( 'init', array( $this, 'wpinv_post_actions' ) );
-        add_action( 'init', array( $this, 'wpinv_get_actions' ) );
-        add_action( 'wpinv_cancel_subscription', array( $this, 'wpinv_process_cancellation' ) );
-        add_action( 'wpi-pending_wpi_invoice', array( $this, 'wpinv_add_update_subscription' ), 10, 2 );
-        add_action( 'wpinv_subscriptions_front_notices', array( $this, 'notices' ) );
+        add_action('admin_menu', array($this, 'wpinv_subscriptions_list'), 10);
+        add_action('admin_notices', array($this, 'notices'));
+        add_action('init', array($this, 'wpinv_post_actions'));
+        add_action('init', array($this, 'wpinv_get_actions'));
+        add_action('wpinv_cancel_subscription', array($this, 'wpinv_process_cancellation'));
+        add_action('wpi-pending_wpi_invoice', array($this, 'wpinv_add_update_subscription'), 10, 2);
+        add_action('wpinv_subscriptions_front_notices', array($this, 'notices'));
     }
 
     /**
@@ -104,8 +104,8 @@ 
     public function wpinv_subscriptions_list() {
         add_submenu_page(
             'wpinv',
-            __( 'Subscriptions', 'invoicing' ),
-            __( 'Subscriptions', 'invoicing' ),
+            __('Subscriptions', 'invoicing'),
+            __('Subscriptions', 'invoicing'),
             'manage_invoicing',
             'wpinv-subscriptions',
             'wpinv_subscriptions_page'
@@ -114,37 +114,37 @@ 
 
     public function notices() {
 
-        if( empty( $_GET['wpinv-message'] ) ) {
+        if (empty($_GET['wpinv-message'])) {
             return;
         }
 
         $type    = 'updated';
         $message = '';
 
-        switch( strtolower( $_GET['wpinv-message'] ) ) {
+        switch (strtolower($_GET['wpinv-message'])) {
 
             case 'updated' :
 
-                $message = __( 'Subscription updated successfully.', 'invoicing' );
+                $message = __('Subscription updated successfully.', 'invoicing');
 
                 break;
 
             case 'deleted' :
 
-                $message = __( 'Subscription deleted successfully.', 'invoicing' );
+                $message = __('Subscription deleted successfully.', 'invoicing');
 
                 break;
 
             case 'cancelled' :
 
-                $message = __( 'Subscription cancelled successfully.', 'invoicing' );
+                $message = __('Subscription cancelled successfully.', 'invoicing');
 
                 break;
 
         }
 
-        if ( ! empty( $message ) ) {
-            echo '<div class="' . esc_attr( $type ) . '"><p>' . $message . '</p></div>';
+        if (!empty($message)) {
+            echo '<div class="' . esc_attr($type) . '"><p>' . $message . '</p></div>';
         }
 
     }
@@ -157,8 +157,8 @@ 
      * @return void
      */
     function wpinv_get_actions() {
-        if ( isset( $_GET['wpinv_action'] ) ) {
-            do_action( 'wpinv_' . $_GET['wpinv_action'], $_GET );
+        if (isset($_GET['wpinv_action'])) {
+            do_action('wpinv_' . $_GET['wpinv_action'], $_GET);
         }
     }
 
@@ -170,8 +170,8 @@ 
      * @return void
      */
     function wpinv_post_actions() {
-        if ( isset( $_POST['wpinv_action'] ) ) {
-            do_action( 'wpinv_' . $_POST['wpinv_action'], $_POST );
+        if (isset($_POST['wpinv_action'])) {
+            do_action('wpinv_' . $_POST['wpinv_action'], $_POST);
         }
     }
 
@@ -182,24 +182,24 @@ 
      * @param int $frequency_count The frequency of the period.
      * @return mixed|string|void
      */
-    public static function wpinv_get_pretty_subscription_frequency( $period, $frequency_count = 1) {
+    public static function wpinv_get_pretty_subscription_frequency($period, $frequency_count = 1) {
         $frequency = '';
         //Format period details
-        switch ( $period ) {
+        switch ($period) {
             case 'day' :
-                $frequency = sprintf( _n('%d Day', '%d Days', $frequency_count, 'invoicing'), $frequency_count);
+                $frequency = sprintf(_n('%d Day', '%d Days', $frequency_count, 'invoicing'), $frequency_count);
                 break;
             case 'week' :
-                $frequency = sprintf( _n('%d Week', '%d Weeks', $frequency_count, 'invoicing'), $frequency_count);
+                $frequency = sprintf(_n('%d Week', '%d Weeks', $frequency_count, 'invoicing'), $frequency_count);
                 break;
             case 'month' :
-                $frequency = sprintf( _n('%d Month', '%d Months', $frequency_count, 'invoicing'), $frequency_count);
+                $frequency = sprintf(_n('%d Month', '%d Months', $frequency_count, 'invoicing'), $frequency_count);
                 break;
             case 'year' :
-                $frequency = sprintf( _n('%d Year', '%d Years', $frequency_count, 'invoicing'), $frequency_count);
+                $frequency = sprintf(_n('%d Year', '%d Years', $frequency_count, 'invoicing'), $frequency_count);
                 break;
             default :
-                $frequency = apply_filters( 'wpinv_recurring_subscription_frequency', $frequency, $period, $frequency_count );
+                $frequency = apply_filters('wpinv_recurring_subscription_frequency', $frequency, $period, $frequency_count);
                 break;
         }
 
@@ -214,50 +214,50 @@ 
      * @since       1.0.0
      * @return      void
      */
-    public function wpinv_process_cancellation( $data ) {
+    public function wpinv_process_cancellation($data) {
 
 
-        if( empty( $data['sub_id'] ) ) {
+        if (empty($data['sub_id'])) {
             return;
         }
 
-        if( ! is_user_logged_in() ) {
+        if (!is_user_logged_in()) {
             return;
         }
 
-        if( ! wp_verify_nonce( $data['_wpnonce'], 'wpinv-recurring-cancel' ) ) {
-            wp_die( __( 'Error', 'invoicing' ), __( 'Nonce verification failed', 'invoicing' ), array( 'response' => 403 ) );
+        if (!wp_verify_nonce($data['_wpnonce'], 'wpinv-recurring-cancel')) {
+            wp_die(__('Error', 'invoicing'), __('Nonce verification failed', 'invoicing'), array('response' => 403));
         }
 
-        $data['sub_id'] = absint( $data['sub_id'] );
-        $subscription   = new WPInv_Subscription( $data['sub_id'] );
+        $data['sub_id'] = absint($data['sub_id']);
+        $subscription   = new WPInv_Subscription($data['sub_id']);
 
-        if( ! $subscription->can_cancel() ) {
-            wp_die( __( 'Error', 'invoicing' ), __( 'This subscription cannot be cancelled', 'invoicing' ), array( 'response' => 403 ) );
+        if (!$subscription->can_cancel()) {
+            wp_die(__('Error', 'invoicing'), __('This subscription cannot be cancelled', 'invoicing'), array('response' => 403));
         }
 
         try {
 
-            do_action( 'wpinv_recurring_cancel_' . $subscription->gateway . '_subscription', $subscription, true );
+            do_action('wpinv_recurring_cancel_' . $subscription->gateway . '_subscription', $subscription, true);
 
             $subscription->cancel();
 
-            if( is_admin() ) {
+            if (is_admin()) {
 
-                wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=cancelled&id=' . $subscription->id ) );
+                wp_redirect(admin_url('admin.php?page=wpinv-subscriptions&wpinv-message=cancelled&id=' . $subscription->id));
                 exit;
 
             } else {
 
-                $redirect = remove_query_arg( array( '_wpnonce', 'wpinv_action', 'sub_id' ), add_query_arg( array( 'wpinv-message' => 'cancelled' ) ) );
-                $redirect = apply_filters( 'wpinv_recurring_cancellation_redirect', $redirect, $subscription );
-                wp_safe_redirect( $redirect );
+                $redirect = remove_query_arg(array('_wpnonce', 'wpinv_action', 'sub_id'), add_query_arg(array('wpinv-message' => 'cancelled')));
+                $redirect = apply_filters('wpinv_recurring_cancellation_redirect', $redirect, $subscription);
+                wp_safe_redirect($redirect);
                 exit;
 
             }
 
-        } catch ( Exception $e ) {
-            wp_die( __( 'Error', 'invoicing' ), $e->getMessage(), array( 'response' => 403 ) );
+        } catch (Exception $e) {
+            wp_die(__('Error', 'invoicing'), $e->getMessage(), array('response' => 403));
         }
 
     }
@@ -269,46 +269,46 @@ 
      * @since       1.0.0
      * @return      void
      */
-    public function wpinv_add_update_subscription( $invoice_id, $invoice ) {
+    public function wpinv_add_update_subscription($invoice_id, $invoice) {
 
-        remove_action( 'save_post', __FUNCTION__ );
+        remove_action('save_post', __FUNCTION__);
 
-        if(empty($invoice_id) || 'wpi_invoice' != get_post_type($invoice_id)){
+        if (empty($invoice_id) || 'wpi_invoice' != get_post_type($invoice_id)) {
             return;
         }
 
-        if ( defined( 'DOING_AUTOSAVE' ) ) {
+        if (defined('DOING_AUTOSAVE')) {
             return;
         }
 
-        if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+        if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
             return;
         }
 
         $invoice_obj = new WPInv_Invoice($invoice_id);
 
-        if ( !$invoice_obj->is_recurring() ) {
+        if (!$invoice_obj->is_recurring()) {
             return;
         }
 
         $item_id = $invoice_obj->get_recurring();
-        $item = new WPInv_Item( $item_id );
+        $item = new WPInv_Item($item_id);
 
         $period             = $item->get_recurring_period(true);
         $interval           = $item->get_recurring_interval();
         $bill_times         = (int)$item->get_recurring_limit();
-        $initial_amount     = wpinv_sanitize_amount( $invoice_obj->get_total(), 2 );
-        $recurring_amount   = wpinv_sanitize_amount( $invoice_obj->get_recurring_details( 'total' ), 2 );
+        $initial_amount     = wpinv_sanitize_amount($invoice_obj->get_total(), 2);
+        $recurring_amount   = wpinv_sanitize_amount($invoice_obj->get_recurring_details('total'), 2);
         $status             = 'pending';
-        $expiration         = date( 'Y-m-d H:i:s', strtotime( '+' . $interval . ' ' . $period  . ' 23:59:59', current_time( 'timestamp' ) ) );
+        $expiration         = date('Y-m-d H:i:s', strtotime('+' . $interval . ' ' . $period . ' 23:59:59', current_time('timestamp')));
 
 
         $trial_period = '';
-        if ( $invoice_obj->is_free_trial() && $item->has_free_trial() ) {
+        if ($invoice_obj->is_free_trial() && $item->has_free_trial()) {
             $trial_period       = $item->get_trial_period(true);
             $free_trial         = $item->get_free_trial();
-            $trial_period       = ! empty( $invoice_obj->is_free_trial() ) ? $free_trial . ' ' . $trial_period : '';
-            $expiration         = date( 'Y-m-d H:i:s', strtotime( '+' . $trial_period . ' 23:59:59', current_time( 'timestamp' ) ) );
+            $trial_period       = !empty($invoice_obj->is_free_trial()) ? $free_trial . ' ' . $trial_period : '';
+            $expiration         = date('Y-m-d H:i:s', strtotime('+' . $trial_period . ' 23:59:59', current_time('timestamp')));
             $status = 'trialling';
         }
 
@@ -322,7 +322,7 @@ 
             'initial_amount'    => $initial_amount,
             'recurring_amount'  => $recurring_amount,
             'bill_times'        => $bill_times,
-            'created'           => date( 'Y-m-d H:i:s' ),
+            'created'           => date('Y-m-d H:i:s'),
             'expiration'        => $expiration,
             'trial_period'      => $trial_period,
             'profile_id'        => '',
@@ -330,13 +330,13 @@ 
         );
 
         $subs_db      = new WPInv_Subscriptions_DB;
-        $subs         = $subs_db->get_subscriptions( array( 'parent_payment_id' => $invoice_obj->ID, 'number' => 1 ) );
-        $subscription = reset( $subs );
+        $subs         = $subs_db->get_subscriptions(array('parent_payment_id' => $invoice_obj->ID, 'number' => 1));
+        $subscription = reset($subs);
 
-        if( !$subscription || $subscription->id <= 0 ) {
+        if (!$subscription || $subscription->id <= 0) {
 
             $subscription = new WPInv_Subscription();
-            $subscription->create( $args );
+            $subscription->create($args);
 
         }
 

includes/wpinv-subscription.php

Doc Comments +6 added lines, -6 removed lines

@@ -257,7 +257,7 @@ 
      *
      * @since  2.4
      * @param  array $args Array of values for the payment, including amount and transaction ID
-     * @return bool
+     * @return false|string
      */
     public function add_payment( $args = array() ) {
 
@@ -286,7 +286,7 @@ 
 	 * Retrieves the transaction ID from the subscription
 	 *
 	 * @since  1.0.0
-	 * @return bool
+	 * @return string
 	 */
 	public function get_transaction_id() {
 
@@ -308,7 +308,7 @@ 
 	 * Stores the transaction ID for the subscription purchase
 	 *
 	 * @since  1.0.0.4
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function set_transaction_id( $txn_id = '' ) {
 		$this->update( array( 'transaction_id' => $txn_id ) );
@@ -319,7 +319,7 @@ 
 	 * Renews a subscription
 	 *
 	 * @since  1.0.0
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function renew() {
 
@@ -408,7 +408,7 @@ 
 	 *
 	 * @since  1.0.0
 	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
-	 * @return void
+	 * @return false|null
 	 */
 	public function expire( $check_expiration = false ) {
 
@@ -655,7 +655,7 @@ 
 	 * Retrieves the subscription status
 	 *
 	 * @since  1.0.0
-	 * @return int
+	 * @return string
 	 */
 	public function get_status() {
 

Indentation +519 added lines, -519 removed lines

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

Spacing +129 added lines, -129 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,15 +38,15 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+	function __construct($_id_or_object = 0, $_by_profile_id = false) {
 
 		$this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+		if ($_by_profile_id) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+			$_sub = $this->subs_db->get_by('profile_id', $_id_or_object);
 
-			if( empty( $_sub ) ) {
+			if (empty($_sub)) {
 				return false;
 			}
 
@@ -54,7 +54,7 @@ 
 
 		}
 
-		return $this->setup_subscription( $_id_or_object );
+		return $this->setup_subscription($_id_or_object);
 	}
 
 	/**
@@ -63,34 +63,34 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+	private function setup_subscription($id_or_object = 0) {
 
-		if( empty( $id_or_object ) ) {
+		if (empty($id_or_object)) {
 			return false;
 		}
 
-		if( is_numeric( $id_or_object ) ) {
+		if (is_numeric($id_or_object)) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+			$sub = $this->subs_db->get($id_or_object);
 
-		} elseif( is_object( $id_or_object ) ) {
+		} elseif (is_object($id_or_object)) {
 
 			$sub = $id_or_object;
 
 		}
 
-		if( empty( $sub ) ) {
+		if (empty($sub)) {
 			return false;
 		}
 
-		foreach( $sub as $key => $value ) {
+		foreach ($sub as $key => $value) {
 			$this->$key = $value;
 		}
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+		$this->customer = get_userdata($this->customer_id);
+		$this->gateway  = wpinv_get_payment_gateway($this->parent_payment_id);
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+		do_action('wpinv_recurring_setup_subscription', $this);
 
 		return $this;
 	}
@@ -100,15 +100,15 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_' . $key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_' . $key));
 
 		} else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+			return new WP_Error('wpinv-subscription-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
 
 		}
 
@@ -121,9 +121,9 @@ 
 	 * @param  array  $data Array of attributes for a subscription
 	 * @return mixed  false if data isn't passed and class not instantiated for creation
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
-		if ( $this->id != 0 ) {
+		if ($this->id != 0) {
 			return false;
 		}
 
@@ -142,11 +142,11 @@ 
 			'profile_id'        => '',
 		);
 
-		$args = wp_parse_args( $data, $defaults );
+		$args = wp_parse_args($data, $defaults);
 
-		if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
+		if ($args['expiration'] && strtotime('NOW', current_time('timestamp')) > strtotime($args['expiration'], current_time('timestamp'))) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+			if ('active' == $args['status'] || 'trialling' == $args['status']) {
 
 				// Force an active subscription to expired if expiration date is in the past
 				$args['status'] = 'expired';
@@ -154,13 +154,13 @@ 
 			}
 		}
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+		do_action('wpinv_subscription_pre_create', $args);
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+		$id = $this->subs_db->insert($args, 'subscription');
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+		do_action('wpinv_subscription_post_create', $id, $args);
 
-		return $this->setup_subscription( $id );
+		return $this->setup_subscription($id);
 
 	}
 
@@ -171,11 +171,11 @@ 
 	 * @param  array $args Array of fields to update
 	 * @return bool
 	 */
-	public function update( $args = array() ) {
+	public function update($args = array()) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+		$ret = $this->subs_db->update($this->id, $args);
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+		do_action('wpinv_recurring_update_subscription', $this->id, $args, $this);
 
 		return $ret;
 
@@ -188,7 +188,7 @@ 
 	 * @return bool
 	 */
 	public function delete() {
-		return $this->subs_db->delete( $this->id );
+		return $this->subs_db->delete($this->id);
 	}
 
 	/**
@@ -211,12 +211,12 @@ 
 	 */
 	public function get_child_payments() {
 
-		$payments = get_posts( array(
-			'post_parent'    => (int) $this->parent_payment_id,
+		$payments = get_posts(array(
+			'post_parent'    => (int)$this->parent_payment_id,
 			'posts_per_page' => '999',
-			'post_status'    => array( 'publish', 'wpi-processing', 'wpi-renewal' ),
+			'post_status'    => array('publish', 'wpi-processing', 'wpi-renewal'),
 			'post_type'      => 'wpi_invoice'
-		) );
+		));
 
 		return $payments;
 
@@ -230,8 +230,8 @@ 
 	 */
 	public function get_total_payments() {
 
-		if('pending' != $this->status){
-            return count( $this->get_child_payments() ) + 1;
+		if ('pending' != $this->status) {
+            return count($this->get_child_payments()) + 1;
         } else {
             return count($this->get_child_payments());
         }
@@ -248,8 +248,8 @@ 
 
 		$times_billed = $this->get_total_payments();
 
-		if( ! empty( $this->trial_period ) ) {
-            if('pending' != $this->status){
+		if (!empty($this->trial_period)) {
+            if ('pending' != $this->status) {
                 $times_billed = 0;
             } else {
                 $times_billed -= 1;
@@ -267,29 +267,29 @@ 
      * @param  array $args Array of values for the payment, including amount and transaction ID
      * @return bool
      */
-    public function add_payment( $args = array() ) {
+    public function add_payment($args = array()) {
 
-        $args = wp_parse_args( $args, array(
+        $args = wp_parse_args($args, array(
             'amount'         => '',
             'transaction_id' => '',
             'gateway'        => ''
-        ) );
+        ));
 
-        if ( $this->payment_exists( $args['transaction_id'] ) ) {
+        if ($this->payment_exists($args['transaction_id'])) {
             return false;
         }
 
-        if(!$this->parent_payment_id){
+        if (!$this->parent_payment_id) {
             return false;
         }
 
         $invoice = new WPInv_Invoice($this->parent_payment_id);
-        $invoice->ID = $invoice->title = $invoice->number ='';
+        $invoice->ID = $invoice->title = $invoice->number = '';
         $invoice->parent_invoice = $this->parent_payment_id;
         $invoice->save();
 
-        do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
-        do_action( 'wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id'] );
+        do_action('wpinv_recurring_add_subscription_payment', $invoice, $this);
+        do_action('wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id']);
 
         return $invoice->ID;
     }
@@ -302,12 +302,12 @@ 
 	 */
 	public function get_transaction_id() {
 
-		if( empty( $this->transaction_id ) ) {
+		if (empty($this->transaction_id)) {
 
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+			$txn_id = wpinv_get_payment_transaction_id($this->parent_payment_id);
 
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
+			if (!empty($txn_id) && (int)$this->parent_payment_id !== (int)$txn_id) {
+				$this->set_transaction_id($txn_id);
 			}
 
 		}
@@ -322,8 +322,8 @@ 
 	 * @since  1.0.0.4
 	 * @return bool
 	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
+	public function set_transaction_id($txn_id = '') {
+		$this->update(array('transaction_id' => $txn_id));
 		$this->transaction_id = $txn_id;
 	}
 
@@ -339,35 +339,35 @@ 
 
 
 		// Determine what date to use as the start for the new expiration calculation
-		if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
+		if ($expires > current_time('timestamp') && $this->is_active()) {
 
-			$base_date  = $expires;
+			$base_date = $expires;
 
 		} else {
 
-			$base_date  = current_time( 'timestamp' );
+			$base_date = current_time('timestamp');
 
 		}
 
-		$last_day = cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
+		$last_day = cal_days_in_month(CAL_GREGORIAN, date('n', $base_date), date('Y', $base_date));
 
 
 		$frequency = isset($this->frequency) ? $this->frequency : 1;
-		$expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
+		$expiration = date('Y-m-d H:i:s', strtotime('+' . $frequency . ' ' . $this->period . ' 23:59:59', $base_date));
 
-		if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
-			$expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
+		if (date('j', $base_date) == $last_day && 'day' != $this->period) {
+			$expiration = date('Y-m-d H:i:s', strtotime($expiration . ' +2 days'));
 		}
 
-		$expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
+		$expiration  = apply_filters('wpinv_subscription_renewal_expiration', $expiration, $this->id, $this);
 
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
+		do_action('wpinv_subscription_pre_renew', $this->id, $expiration, $this);
 
 		$this->status = 'active';
 		$times_billed = $this->get_times_billed();
 
 		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+		if ($this->bill_times > 0 && $times_billed >= $this->bill_times) {
 			$this->complete();
 			$this->status = 'completed';
 		}
@@ -377,10 +377,10 @@ 
 			'status'     => $this->status,
 		);
 
-        $this->subs_db->update( $this->id, $args );
+        $this->subs_db->update($this->id, $args);
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+		do_action('wpinv_subscription_post_renew', $this->id, $expiration, $this);
+		do_action('wpinv_recurring_set_subscription_status', $this->id, $this->status, $this);
 
 	}
 
@@ -395,7 +395,7 @@ 
 	public function complete() {
 
 		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
+		if ('cancelled' === $this->status) {
 			return;
 		}
 
@@ -403,11 +403,11 @@ 
 			'status' => 'completed'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+			do_action('wpinv_subscription_completed', $this->id, $this);
 
 		}
 
@@ -422,15 +422,15 @@ 
 	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
 	 * @return void
 	 */
-	public function expire( $check_expiration = false ) {
+	public function expire($check_expiration = false) {
 
 		$expiration = $this->expiration;
 
-		if( $check_expiration && $this->check_expiration() ) {
+		if ($check_expiration && $this->check_expiration()) {
 
 			// check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+			if ($expiration < $this->get_expiration() && current_time('timestamp') < $this->get_expiration_time()) {
 
 				return false; // Do not mark as expired since real expiration date is in the future
 			}
@@ -441,11 +441,11 @@ 
 			'status' => 'expired'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+			do_action('wpinv_subscription_expired', $this->id, $this);
 
 		}
 
@@ -463,11 +463,11 @@ 
 			'status' => 'failing'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
+			do_action('wpinv_subscription_failing', $this->id, $this);
 
 
 		}
@@ -482,7 +482,7 @@ 
 	 */
 	public function cancel() {
 
-		if( 'cancelled' === $this->status ) {
+		if ('cancelled' === $this->status) {
 			return; // Already cancelled
 		}
 
@@ -490,25 +490,25 @@ 
 			'status' => 'cancelled'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
-            if( is_user_logged_in() ) {
+            if (is_user_logged_in()) {
 
-                $userdata = get_userdata( get_current_user_id() );
+                $userdata = get_userdata(get_current_user_id());
                 $user     = $userdata->display_name;
 
             } else {
 
-                $user = __( 'gateway', 'invoicing' );
+                $user = __('gateway', 'invoicing');
 
             }
 
-            $note = sprintf( __( 'Subscription for Invoice #%d cancelled by %s', 'invoicing' ), $this->parent_payment_id, $user );
-            wpinv_insert_payment_note( $this->parent_payment_id, $note, '', '', true );
+            $note = sprintf(__('Subscription for Invoice #%d cancelled by %s', 'invoicing'), $this->parent_payment_id, $user);
+            wpinv_insert_payment_note($this->parent_payment_id, $note, '', '', true);
 
 		    $this->status = 'cancelled';
 
-			do_action( 'wpinv_subscription_cancelled', $this->id, $this );
+			do_action('wpinv_subscription_cancelled', $this->id, $this);
 
 
 		}
@@ -526,10 +526,10 @@ 
 	 */
 	public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+	    if ($this->gateway === 'manual' || in_array($this->status, $this->get_cancellable_statuses())) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+		return apply_filters('wpinv_subscription_can_cancel', $ret, $this);
 	}
 
     /**
@@ -540,7 +540,7 @@ 
      * @return      array
      */
     public function get_cancellable_statuses() {
-        return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
+        return apply_filters('wpinv_recurring_cancellable_statuses', array('active', 'trialling', 'failing'));
     }
 
 	/**
@@ -551,9 +551,9 @@ 
 	 */
 	public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id)), 'wpinv-recurring-cancel');
 
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+		return apply_filters('wpinv_subscription_cancel_url', $url, $this);
 	}
 
 	/**
@@ -567,7 +567,7 @@ 
 	 */
 	public function can_renew() {
 
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+		return apply_filters('wpinv_subscription_can_renew', true, $this);
 	}
 
 	/**
@@ -578,9 +578,9 @@ 
 	 */
 	public function get_renew_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_action' => 'renew_subscription', 'sub_id' => $this->id)), 'wpinv-recurring-renew');
 
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+		return apply_filters('wpinv_subscription_renew_url', $url, $this);
 	}
 
 	/**
@@ -590,7 +590,7 @@ 
 	 * @return bool
 	 */
 	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
+		return apply_filters('wpinv_subscription_can_update', false, $this);
 	}
 
 	/**
@@ -601,9 +601,9 @@ 
 	 */
 	public function get_update_url() {
 
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+		$url = add_query_arg(array('action' => 'update', 'subscription_id' => $this->id));
 
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+		return apply_filters('wpinv_subscription_update_url', $url, $this);
 	}
 
 	/**
@@ -616,11 +616,11 @@ 
 
 		$ret = false;
 
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+		if (!$this->is_expired() && ($this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling')) {
 			$ret = true;
 		}
 
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_active', $ret, $this->id, $this);
 
 	}
 
@@ -634,26 +634,26 @@ 
 
 		$ret = false;
 
-		if ( $this->status == 'expired' ) {
+		if ($this->status == 'expired') {
 
 			$ret = true;
 
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+		} elseif ('active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling') {
 
 			$ret        = false;
 			$expiration = $this->get_expiration_time();
 
-			if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+			if ($expiration && strtotime('NOW', current_time('timestamp')) > $expiration) {
 				$ret = true;
 
-				if ( 'active' === $this->status || $this->status == 'trialling'  ) {
+				if ('active' === $this->status || $this->status == 'trialling') {
 					$this->expire();
 				}
 			}
 
 		}
 
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_expired', $ret, $this->id, $this);
 
 	}
 
@@ -674,7 +674,7 @@ 
 	 * @return int
 	 */
 	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
+		return strtotime($this->expiration, current_time('timestamp'));
 	}
 
 	/**
@@ -698,37 +698,37 @@ 
 	 */
 	public function get_status_label() {
 
-		switch( $this->get_status() ) {
+		switch ($this->get_status()) {
 			case 'active' :
-				$status = __( 'Active', 'invoicing' );
+				$status = __('Active', 'invoicing');
 				break;
 
 			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
+				$status = __('Cancelled', 'invoicing');
 				break;
 
 			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
+				$status = __('Expired', 'invoicing');
 				break;
 
 			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
+				$status = __('Pending', 'invoicing');
 				break;
 
 			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
+				$status = __('Failing', 'invoicing');
 				break;
 
 			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
+				$status = __('Trialling', 'invoicing');
 				break;
 
 			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
+				$status = __('Completed', 'invoicing');
 				break;
 
 			default:
-				$status = ucfirst( $this->get_status() );
+				$status = ucfirst($this->get_status());
 				break;
 		}
 
@@ -743,51 +743,51 @@ 
      */
     public function get_status_label_html() {
 
-        switch( $get_status = $this->get_status() ) {
+        switch ($get_status = $this->get_status()) {
             case 'active' :
-                $status = __( 'Active', 'invoicing' );
+                $status = __('Active', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'cancelled' :
-                $status = __( 'Cancelled', 'invoicing' );
+                $status = __('Cancelled', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'expired' :
-                $status = __( 'Expired', 'invoicing' );
+                $status = __('Expired', 'invoicing');
                 $class = 'label-default';
                 break;
 
             case 'pending' :
-                $status = __( 'Pending', 'invoicing' );
+                $status = __('Pending', 'invoicing');
                 $class = 'label-primary';
                 break;
 
             case 'failing' :
-                $status = __( 'Failing', 'invoicing' );
+                $status = __('Failing', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'trialling' :
-                $status = __( 'Trialling', 'invoicing' );
+                $status = __('Trialling', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'completed' :
-                $status = __( 'Completed', 'invoicing' );
+                $status = __('Completed', 'invoicing');
                 $class = 'label-success';
                 break;
 
             default:
-                $status = ucfirst( $this->get_status() );
+                $status = ucfirst($this->get_status());
                 $class = 'label-default';
                 break;
         }
 
         $label = '<span class="sub-status label label-sub-' . $get_status . ' ' . $class . '">' . $status . '</span>';
 
-        return apply_filters( 'wpinv_subscription_status_label_html', $label, $get_status, $status );
+        return apply_filters('wpinv_subscription_status_label_html', $label, $get_status, $status);
     }
 
     /**
@@ -797,18 +797,18 @@ 
      * @param  string $txn_id The transaction ID from the merchant processor
      * @return bool
      */
-    public function payment_exists( $txn_id = '' ) {
+    public function payment_exists($txn_id = '') {
         global $wpdb;
 
-        if ( empty( $txn_id ) ) {
+        if (empty($txn_id)) {
             return false;
         }
 
-        $txn_id = esc_sql( $txn_id );
+        $txn_id = esc_sql($txn_id);
 
-        $purchase = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1" );
+        $purchase = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1");
 
-        if ( $purchase != null ) {
+        if ($purchase != null) {
             return true;
         }
 

includes/class-wpinv-shortcodes.php

Spacing +30 added lines, -30 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -16,11 +16,11 @@ 
             'wpinv_subscriptions'  => __CLASS__ . '::subscriptions',
         );
 
-        foreach ( $shortcodes as $shortcode => $function ) {
-            add_shortcode( apply_filters( "{$shortcode}_shortcode_tag", $shortcode ), $function );
+        foreach ($shortcodes as $shortcode => $function) {
+            add_shortcode(apply_filters("{$shortcode}_shortcode_tag", $shortcode), $function);
         }
         
-        add_shortcode( 'wpinv_messages', __CLASS__ . '::messages' );
+        add_shortcode('wpinv_messages', __CLASS__ . '::messages');
     }
 
     public static function shortcode_wrapper(
@@ -34,25 +34,25 @@ 
     ) {
         ob_start();
 
-        echo empty( $wrapper['before'] ) ? '<div class="' . esc_attr( $wrapper['class'] ) . '">' : $wrapper['before'];
-        call_user_func( $function, $atts );
-        echo empty( $wrapper['after'] ) ? '</div>' : $wrapper['after'];
+        echo empty($wrapper['before']) ? '<div class="' . esc_attr($wrapper['class']) . '">' : $wrapper['before'];
+        call_user_func($function, $atts);
+        echo empty($wrapper['after']) ? '</div>' : $wrapper['after'];
 
         return ob_get_clean();
     }
 
-    public static function checkout( $atts = array(), $content = null ) {
-        return wpinv_checkout_form( $atts, $content );
+    public static function checkout($atts = array(), $content = null) {
+        return wpinv_checkout_form($atts, $content);
     }
 
-    public static function messages( $atts, $content = null ) {
+    public static function messages($atts, $content = null) {
         ob_start();
         wpinv_print_errors();
         return '<div class="wpinv">' . ob_get_clean() . '</div>';
     }
     
-    public static function history( $atts, $content = null ) {
-        return self::shortcode_wrapper( array( __CLASS__, 'history_output' ), $atts );
+    public static function history($atts, $content = null) {
+        return self::shortcode_wrapper(array(__CLASS__, 'history_output'), $atts);
     }
 
     /**
@@ -60,28 +60,28 @@ 
      *
      * @param array $atts
      */
-    public static function history_output( $atts ) {
-        do_action( 'wpinv_before_user_invoice_history' );
-        wpinv_get_template_part( 'wpinv-invoice-history', $atts );
-        do_action( 'wpinv_after_user_invoice_history' );
+    public static function history_output($atts) {
+        do_action('wpinv_before_user_invoice_history');
+        wpinv_get_template_part('wpinv-invoice-history', $atts);
+        do_action('wpinv_after_user_invoice_history');
     }
     
-    public static function receipt( $atts, $content = null ) {
-        return wpinv_payment_receipt( $atts, $content );
+    public static function receipt($atts, $content = null) {
+        return wpinv_payment_receipt($atts, $content);
     }
 
-    public static function buy( $atts, $content = null ) {
-        $a = shortcode_atts( array(
+    public static function buy($atts, $content = null) {
+        $a = shortcode_atts(array(
             'items' => '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
-            'title' => __('Buy Now', 'invoicing' ), // the button title
+            'title' => __('Buy Now', 'invoicing'), // the button title
             'post_id' => '', // any related post_id
-        ), $atts );
+        ), $atts);
         
         $post_id = isset($a['post_id']) ? (int)$a['post_id'] : '';
 
         $html = '<div class="wpi-buy-button-wrapper">';
-        $html .= '<input type="submit" name="submit" class="button button-primary wpi-buy-button" value="'.$a['title'].'" onclick="wpi_buy(\''.$a['items'].'\','.$post_id.');" />';
-        $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
+        $html .= '<input type="submit" name="submit" class="button button-primary wpi-buy-button" value="' . $a['title'] . '" onclick="wpi_buy(\'' . $a['items'] . '\',' . $post_id . ');" />';
+        $html .= wp_nonce_field('wpinv_buy_items', 'wpinv_buy_nonce', true, false);
         $html .= '</div>';
 
 
@@ -89,8 +89,8 @@ 
 
     }
 
-    public static function subscriptions( $atts, $content = null ) {
-        return self::shortcode_wrapper( array( __CLASS__, 'subscriptions_output' ), $atts );
+    public static function subscriptions($atts, $content = null) {
+        return self::shortcode_wrapper(array(__CLASS__, 'subscriptions_output'), $atts);
     }
 
     /**
@@ -98,9 +98,9 @@ 
      *
      * @param array $atts
      */
-    public static function subscriptions_output( $atts ) {
-        do_action( 'wpinv_before_user_subscriptions' );
-        wpinv_get_template_part( 'wpinv-subscriptions-history', $atts );
-        do_action( 'wpinv_after_user_subscriptions' );
+    public static function subscriptions_output($atts) {
+        do_action('wpinv_before_user_subscriptions');
+        wpinv_get_template_part('wpinv-subscriptions-history', $atts);
+        do_action('wpinv_after_user_subscriptions');
     }
 }

uninstall.php

Spacing +19 added lines, -19 removed lines

@@ -9,58 +9,58 @@
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if (!defined('WP_UNINSTALL_PLUGIN')) {
     exit;
 }
 
 global $wpdb, $wp_version;
 
-$remove_data = get_option( 'wpinv_remove_data_on_invoice_unistall' );
+$remove_data = get_option('wpinv_remove_data_on_invoice_unistall');
 
 /*
  * Only remove ALL product and page data if WPINV_REMOVE_ALL_DATA constant is set to true in user's
  * wp-config.php. This is to prevent data loss when deleting the plugin from the backend
  * and to ensure only the site owner can perform this action.
  */
-if ( defined( 'WPINV_REMOVE_ALL_DATA' ) ) {
+if (defined('WPINV_REMOVE_ALL_DATA')) {
     $remove_data = true === WPINV_REMOVE_ALL_DATA ? true : false;
 }
 
-if ( $remove_data ) {
+if ($remove_data) {
     // Load Invoicing file.
-    include_once( 'invoicing.php' );
+    include_once('invoicing.php');
 
     // Roles + caps.
-    include_once( dirname( __FILE__ ) . '/includes/admin/install.php' );
+    include_once(dirname(__FILE__) . '/includes/admin/install.php');
     wpinv_remove_admin_caps();
     
-    $settings = get_option( 'wpinv_settings' );
+    $settings = get_option('wpinv_settings');
     
     // Delete pages.
-    $wpi_pages = array( 'checkout_page', 'success_page', 'failure_page', 'invoice_history_page', 'quote_history_page', 'invoice_subscription_page' );
-    foreach ( $wpi_pages as $page ) {
-        if ( !empty( $page ) && !empty( $settings[ $page ] ) ) {
-            wp_delete_post( $settings[ $page ], true );
+    $wpi_pages = array('checkout_page', 'success_page', 'failure_page', 'invoice_history_page', 'quote_history_page', 'invoice_subscription_page');
+    foreach ($wpi_pages as $page) {
+        if (!empty($page) && !empty($settings[$page])) {
+            wp_delete_post($settings[$page], true);
         }
     }
     
     // Delete posts + data.
-    $wpdb->query( "DELETE FROM {$wpdb->posts} WHERE post_type IN ( 'wpi_invoice', 'wpi_item', 'wpi_discount', 'wpi_quote' );" );
-    $wpdb->query( "DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;" );
+    $wpdb->query("DELETE FROM {$wpdb->posts} WHERE post_type IN ( 'wpi_invoice', 'wpi_item', 'wpi_discount', 'wpi_quote' );");
+    $wpdb->query("DELETE meta FROM {$wpdb->postmeta} meta LEFT JOIN {$wpdb->posts} posts ON posts.ID = meta.post_id WHERE posts.ID IS NULL;");
     
     // Delete comments.
-    $wpdb->query( "DELETE FROM {$wpdb->comments} WHERE comment_type LIKE 'wpinv_note';" );
-    $wpdb->query( "DELETE meta FROM {$wpdb->commentmeta} meta LEFT JOIN {$wpdb->comments} comments ON comments.comment_ID = meta.comment_id WHERE comments.comment_ID IS NULL;" );
+    $wpdb->query("DELETE FROM {$wpdb->comments} WHERE comment_type LIKE 'wpinv_note';");
+    $wpdb->query("DELETE meta FROM {$wpdb->commentmeta} meta LEFT JOIN {$wpdb->comments} comments ON comments.comment_ID = meta.comment_id WHERE comments.comment_ID IS NULL;");
     
     // Delete user meta.
-    $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE '%_wpinv_%' OR meta_key LIKE '%_wpi_invoice%' OR meta_key LIKE '%_wpi_item%' OR meta_key LIKE '%_wpi_discount%' OR meta_key LIKE '_wpi_stripe%' OR meta_key LIKE '%_wpi_quote%';" );
+    $wpdb->query("DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE '%_wpinv_%' OR meta_key LIKE '%_wpi_invoice%' OR meta_key LIKE '%_wpi_item%' OR meta_key LIKE '%_wpi_discount%' OR meta_key LIKE '_wpi_stripe%' OR meta_key LIKE '%_wpi_quote%';");
     
     // Cleanup Cron Schedule
-    wp_clear_scheduled_hook( 'wp_session_garbage_collection' );
-    wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
+    wp_clear_scheduled_hook('wp_session_garbage_collection');
+    wp_clear_scheduled_hook('wpinv_register_schedule_event_twicedaily');
     
     // Delete options.
-    $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wpinv_%' OR option_name LIKE '_wpinv_%' OR option_name LIKE '\_transient\_wpinv\_%';" );
+    $wpdb->query("DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wpinv_%' OR option_name LIKE '_wpinv_%' OR option_name LIKE '\_transient\_wpinv\_%';");
     
     // Clear any cached data that has been removed
     wp_cache_flush();

includes/admin/register-settings.php

Spacing +512 added lines, -512 removed lines

@@ -1,66 +1,66 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
     global $wpinv_options;
 
-    $value = isset( $wpinv_options[ $key ] ) ? $wpinv_options[ $key ] : $default;
-    $value = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value = isset($wpinv_options[$key]) ? $wpinv_options[$key] : $default;
+    $value = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
-    if ( empty( $value ) ) {
-        $remove_option = wpinv_delete_option( $key );
+    if (empty($value)) {
+        $remove_option = wpinv_delete_option($key);
         return $remove_option;
     }
 
     // First let's grab the current settings
-    $options = get_option( 'wpinv_settings' );
+    $options = get_option('wpinv_settings');
 
     // Let other plugin alter the value
-    $value = apply_filters( 'wpinv_update_option', $value, $key );
+    $value = apply_filters('wpinv_update_option', $value, $key);
 
     // Next let's try to update the value
-    $options[ $key ] = $value;
-    $did_update = update_option( 'wpinv_settings', $options );
+    $options[$key] = $value;
+    $did_update = update_option('wpinv_settings', $options);
 
     // If it's updated, let's update the global variable
-    if ( $did_update ) {
+    if ($did_update) {
         global $wpinv_options;
-        $wpinv_options[ $key ] = $value;
+        $wpinv_options[$key] = $value;
     }
 
     return $did_update;
 }
 
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // First let's grab the current settings
-    $options = get_option( 'wpinv_settings' );
+    $options = get_option('wpinv_settings');
 
     // Next let's try to update the value
-    if( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
+    if (isset($options[$key])) {
+        unset($options[$key]);
     }
 
-    $did_update = update_option( 'wpinv_settings', $options );
+    $did_update = update_option('wpinv_settings', $options);
 
     // If it updated, let's update the global variable
-    if ( $did_update ){
+    if ($did_update) {
         global $wpinv_options;
         $wpinv_options = $options;
     }
@@ -69,37 +69,37 @@ 
 }
 
 function wpinv_get_settings() {
-    $settings = get_option( 'wpinv_settings' );
+    $settings = get_option('wpinv_settings');
 
-    if ( empty( $settings ) ) {
+    if (empty($settings)) {
         // Update old settings with new single option
-        $general_settings   = is_array( get_option( 'wpinv_settings_general' ) )    ? get_option( 'wpinv_settings_general' )    : array();
-        $gateways_settings  = is_array( get_option( 'wpinv_settings_gateways' ) )   ? get_option( 'wpinv_settings_gateways' )   : array();
-        $email_settings     = is_array( get_option( 'wpinv_settings_emails' ) )     ? get_option( 'wpinv_settings_emails' )     : array();
-        $tax_settings       = is_array( get_option( 'wpinv_settings_taxes' ) )      ? get_option( 'wpinv_settings_taxes' )      : array();
-        $misc_settings      = is_array( get_option( 'wpinv_settings_misc' ) )       ? get_option( 'wpinv_settings_misc' )       : array();
-        $tool_settings      = is_array( get_option( 'wpinv_settings_tools' ) )      ? get_option( 'wpinv_settings_tools' )      : array();
+        $general_settings   = is_array(get_option('wpinv_settings_general')) ? get_option('wpinv_settings_general') : array();
+        $gateways_settings  = is_array(get_option('wpinv_settings_gateways')) ? get_option('wpinv_settings_gateways') : array();
+        $email_settings     = is_array(get_option('wpinv_settings_emails')) ? get_option('wpinv_settings_emails') : array();
+        $tax_settings       = is_array(get_option('wpinv_settings_taxes')) ? get_option('wpinv_settings_taxes') : array();
+        $misc_settings      = is_array(get_option('wpinv_settings_misc')) ? get_option('wpinv_settings_misc') : array();
+        $tool_settings      = is_array(get_option('wpinv_settings_tools')) ? get_option('wpinv_settings_tools') : array();
 
-        $settings = array_merge( $general_settings, $gateways_settings, $tax_settings, $tool_settings );
+        $settings = array_merge($general_settings, $gateways_settings, $tax_settings, $tool_settings);
 
-        update_option( 'wpinv_settings', $settings );
+        update_option('wpinv_settings', $settings);
 
     }
-    return apply_filters( 'wpinv_get_settings', $settings );
+    return apply_filters('wpinv_get_settings', $settings);
 }
 
 function wpinv_register_settings() {
-    if ( false == get_option( 'wpinv_settings' ) ) {
-        add_option( 'wpinv_settings' );
+    if (false == get_option('wpinv_settings')) {
+        add_option('wpinv_settings');
     }
     
     $register_settings = wpinv_get_registered_settings();
     
-    foreach ( $register_settings as $tab => $sections ) {
-        foreach ( $sections as $section => $settings) {
+    foreach ($register_settings as $tab => $sections) {
+        foreach ($sections as $section => $settings) {
             // Check for backwards compatibility
-            $section_tabs = wpinv_get_settings_tab_sections( $tab );
-            if ( ! is_array( $section_tabs ) || ! array_key_exists( $section, $section_tabs ) ) {
+            $section_tabs = wpinv_get_settings_tab_sections($tab);
+            if (!is_array($section_tabs) || !array_key_exists($section, $section_tabs)) {
                 $section = 'main';
                 $settings = $sections;
             }
@@ -111,42 +111,42 @@ 
                 'wpinv_settings_' . $tab . '_' . $section
             );
 
-            foreach ( $settings as $option ) {
+            foreach ($settings as $option) {
                 // For backwards compatibility
-                if ( empty( $option['id'] ) ) {
+                if (empty($option['id'])) {
                     continue;
                 }
 
-                $name = isset( $option['name'] ) ? $option['name'] : '';
+                $name = isset($option['name']) ? $option['name'] : '';
 
                 add_settings_field(
                     'wpinv_settings[' . $option['id'] . ']',
                     $name,
-                    function_exists( 'wpinv_' . $option['type'] . '_callback' ) ? 'wpinv_' . $option['type'] . '_callback' : 'wpinv_missing_callback',
+                    function_exists('wpinv_' . $option['type'] . '_callback') ? 'wpinv_' . $option['type'] . '_callback' : 'wpinv_missing_callback',
                     'wpinv_settings_' . $tab . '_' . $section,
                     'wpinv_settings_' . $tab . '_' . $section,
                     array(
                         'section'     => $section,
-                        'id'          => isset( $option['id'] )          ? $option['id']          : null,
-                        'desc'        => ! empty( $option['desc'] )      ? $option['desc']        : '',
-                        'name'        => isset( $option['name'] )        ? $option['name']        : null,
-                        'size'        => isset( $option['size'] )        ? $option['size']        : null,
-                        'options'     => isset( $option['options'] )     ? $option['options']     : '',
-                        'selected'    => isset( $option['selected'] )    ? $option['selected']    : null,
-                        'std'         => isset( $option['std'] )         ? $option['std']         : '',
-                        'min'         => isset( $option['min'] )         ? $option['min']         : null,
-                        'max'         => isset( $option['max'] )         ? $option['max']         : null,
-                        'step'        => isset( $option['step'] )        ? $option['step']        : null,
-                        'chosen'      => isset( $option['chosen'] )      ? $option['chosen']      : null,
-                        'placeholder' => isset( $option['placeholder'] ) ? $option['placeholder'] : null,
-                        'allow_blank' => isset( $option['allow_blank'] ) ? $option['allow_blank'] : true,
-                        'readonly'    => isset( $option['readonly'] )    ? $option['readonly']    : false,
-                        'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
-                        'onchange'    => !empty( $option['onchange'] )   ? $option['onchange']    : '',
-                        'custom'      => !empty( $option['custom'] )     ? $option['custom']      : '',
-                        'class'       =>  !empty( $option['class'] )     ? $option['class']      : '',
-                        'cols'        => !empty( $option['cols'] ) && (int)$option['cols'] > 0 ? (int)$option['cols'] : 50,
-                        'rows'        => !empty( $option['rows'] ) && (int)$option['rows'] > 0 ? (int)$option['rows'] : 5,
+                        'id'          => isset($option['id']) ? $option['id'] : null,
+                        'desc'        => !empty($option['desc']) ? $option['desc'] : '',
+                        'name'        => isset($option['name']) ? $option['name'] : null,
+                        'size'        => isset($option['size']) ? $option['size'] : null,
+                        'options'     => isset($option['options']) ? $option['options'] : '',
+                        'selected'    => isset($option['selected']) ? $option['selected'] : null,
+                        'std'         => isset($option['std']) ? $option['std'] : '',
+                        'min'         => isset($option['min']) ? $option['min'] : null,
+                        'max'         => isset($option['max']) ? $option['max'] : null,
+                        'step'        => isset($option['step']) ? $option['step'] : null,
+                        'chosen'      => isset($option['chosen']) ? $option['chosen'] : null,
+                        'placeholder' => isset($option['placeholder']) ? $option['placeholder'] : null,
+                        'allow_blank' => isset($option['allow_blank']) ? $option['allow_blank'] : true,
+                        'readonly'    => isset($option['readonly']) ? $option['readonly'] : false,
+                        'faux'        => isset($option['faux']) ? $option['faux'] : false,
+                        'onchange'    => !empty($option['onchange']) ? $option['onchange'] : '',
+                        'custom'      => !empty($option['custom']) ? $option['custom'] : '',
+                        'class'       =>  !empty($option['class']) ? $option['class'] : '',
+                        'cols'        => !empty($option['cols']) && (int)$option['cols'] > 0 ? (int)$option['cols'] : 50,
+                        'rows'        => !empty($option['rows']) && (int)$option['rows'] > 0 ? (int)$option['rows'] : 5,
                     )
                 );
             }
@@ -154,189 +154,189 @@ 
     }
 
     // Creates our settings in the options table
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 function wpinv_get_registered_settings() {
-    $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) . ')';
     }
     
     $due_payment_options       = array();
-    $due_payment_options[0]    = __( 'Now', 'invoicing' );
-    for ( $i = 1; $i <= 30; $i++ ) {
+    $due_payment_options[0]    = __('Now', 'invoicing');
+    for ($i = 1; $i <= 30; $i++) {
         $due_payment_options[$i] = $i;
     }
     
     $invoice_number_padd_options = array();
-    for ( $i = 0; $i <= 20; $i++ ) {
+    for ($i = 0; $i <= 20; $i++) {
         $invoice_number_padd_options[$i] = $i;
     }
     
     $currency_symbol = wpinv_currency_symbol();
     
     $last_number = '';
-    if ( $last_invoice_number = get_option( 'wpinv_last_invoice_number' ) ) {
-        $last_invoice_number = is_numeric( $last_invoice_number ) ? $last_invoice_number : wpinv_clean_invoice_number( $last_invoice_number );
+    if ($last_invoice_number = get_option('wpinv_last_invoice_number')) {
+        $last_invoice_number = is_numeric($last_invoice_number) ? $last_invoice_number : wpinv_clean_invoice_number($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);
         }
     }
     
     $alert_wrapper_start = '<p style="color: #F00">';
     $alert_wrapper_close = '</p>';
     $wpinv_settings = array(
-        'general' => apply_filters( 'wpinv_settings_general',
+        'general' => apply_filters('wpinv_settings_general',
             array(
                 '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',
                         'chosen'  => true,
-                        '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',
-                        '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' ),
+                        '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',
                     ),
                     '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',
                     ),
                     '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,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     '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,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     '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,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     '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,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     'invoice_subscription_page' => array(
                         'id'          => 'invoice_subscription_page',
-                        'name'        => __( 'Invoice Subscriptions Page', 'invoicing' ),
-                        'desc'        => __( 'This page shows an 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 an subscriptions history for the current user. The <b>[wpinv_subscriptions]</b> short code should be on this page.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $pages,
                         'chosen'      => true,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     )
                 ),
                 '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',
                         'options' => $currency_code_options,
                         'chosen'  => true,
                     ),
                     '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',
                         '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',
@@ -348,29 +348,29 @@ 
                 'labels' => array(
                     'labels' => array(
                         'id'   => 'labels_settings',
-                        'name' => '<h3>' . __( 'Invoice Labels', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Invoice Labels', 'invoicing') . '</h3>',
                         'desc' => '',
                         'type' => 'header',
                     ),
                     'vat_name' => array(
                         'id' => 'vat_name',
-                        'name' => __( 'VAT Name', 'invoicing' ),
-                        'desc' => __( 'Enter the VAT name', 'invoicing' ),
+                        'name' => __('VAT Name', 'invoicing'),
+                        'desc' => __('Enter the VAT name', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => 'VAT'
                     ),
                     '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',
                     )
@@ -382,22 +382,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),
                         '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',
                         'options' => wpinv_get_payment_gateways(),
@@ -411,19 +411,19 @@ 
                 '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' => __( 'Check this to enable taxes on invoices.', 'invoicing' ),
+                        'name' => __('Enable Taxes', 'invoicing'),
+                        'desc' => __('Check this to enable taxes on invoices.', 'invoicing'),
                         'type' => 'checkbox',
                     ),
                     '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',
@@ -435,8 +435,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',
                     ),
                 )
@@ -448,62 +448,62 @@ 
                 '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" and "reply-to" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%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" and "reply-to" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%s', 'invoicing'), $alert_wrapper_start, $alert_wrapper_close),
+                        'std' => get_option('admin_email'),
                         'type' => 'text',
                     ),
                     '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,
                     ),
                     'overdue_days' => array(
                         'id'          => 'overdue_days',
-                        'name'        => __( 'Default Due Date', 'invoicing' ),
-                        'desc'        => __( 'Number of days each Invoice is due after the created date. This will automatically set the date in the "Due Date" field. Can be overridden on individual Invoices.', 'invoicing' ),
+                        'name'        => __('Default Due Date', 'invoicing'),
+                        'desc'        => __('Number of days each Invoice is due after the created date. This will automatically set the date in the "Due Date" field. Can be overridden on individual Invoices.', 'invoicing'),
                         'type'        => 'select',
                         'options'     => $due_payment_options,
                         'chosen'      => true,
                         'std'         => 0,
-                        'placeholder' => __( 'Select a page', 'invoicing' ),
+                        'placeholder' => __('Select a page', 'invoicing'),
                     ),
                     '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 GeoDirectory', '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 GeoDirectory', 'invoicing'),
                         'type' => 'textarea',
                         'class' => 'regular-text',
                         'rows' => 2,
@@ -511,29 +511,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',
                     ),
@@ -552,19 +552,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' ),
+                        'name' => __('Sequential Invoice Numbers', 'invoicing'),
+                        'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing'),
                         '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',
@@ -572,8 +572,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,
@@ -581,8 +581,8 @@ 
                     ),
                     'invoice_number_prefix' => array(
                         'id' => 'invoice_number_prefix',
-                        'name' => __( 'Invoice Number Prefix', 'invoicing' ),
-                        'desc' => __( 'Prefix for all invoice numbers. Ex: WPINV-', 'invoicing' ),
+                        'name' => __('Invoice Number Prefix', 'invoicing'),
+                        'desc' => __('Prefix for all invoice numbers. Ex: WPINV-', 'invoicing'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => 'WPINV-',
@@ -590,32 +590,32 @@ 
                     ),
                     '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',
                     ),
                     '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',
                     ),
                     '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'  => ''
                     ),
@@ -623,74 +623,74 @@ 
                 'fields' => array(
                     'fields_settings' => array(
                         'id'   => 'fields_settings',
-                        'name' => '<h3>' . __( 'Address Fields', 'invoicing' ) . '</h3>',
-                        'desc' => __( 'Tick fields which are mandatory in invoice address fields.', 'invoicing' ),
+                        'name' => '<h3>' . __('Address Fields', 'invoicing') . '</h3>',
+                        'desc' => __('Tick fields which are mandatory in invoice address fields.', 'invoicing'),
                         'type' => 'header',
                     ),
                     'fname_mandatory' => array(
                         'id'   => 'fname_mandatory',
-                        'name' => __( 'First Name', 'invoicing' ),
+                        'name' => __('First Name', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'lname_mandatory' => array(
                         'id'   => 'lname_mandatory',
-                        'name' => __( 'Last Name', 'invoicing' ),
+                        'name' => __('Last Name', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'address_mandatory' => array(
                         'id'   => 'address_mandatory',
-                        'name' => __( 'Address', 'invoicing' ),
+                        'name' => __('Address', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'city_mandatory' => array(
                         'id'   => 'city_mandatory',
-                        'name' => __( 'City', 'invoicing' ),
+                        'name' => __('City', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'country_mandatory' => array(
                         'id'   => 'country_mandatory',
-                        'name' => __( 'Country', 'invoicing' ),
+                        'name' => __('Country', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'state_mandatory' => array(
                         'id'   => 'state_mandatory',
-                        'name' => __( 'State / Province', 'invoicing' ),
+                        'name' => __('State / Province', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'zip_mandatory' => array(
                         'id'   => 'zip_mandatory',
-                        'name' => __( 'ZIP / Postcode', 'invoicing' ),
+                        'name' => __('ZIP / Postcode', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'phone_mandatory' => array(
                         'id'   => 'phone_mandatory',
-                        'name' => __( 'Phone Number', 'invoicing' ),
+                        'name' => __('Phone Number', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => true,
                     ),
                     'address_autofill_settings' => array(
                         'id'   => 'address_autofill_settings',
-                        'name' => '<h3>' . __( 'Google Address Auto Complete', 'invoicing' ) . '</h3>',
+                        'name' => '<h3>' . __('Google Address Auto Complete', 'invoicing') . '</h3>',
                         'type' => 'header',
                     ),
                     'address_autofill_active' => array(
                         'id'   => 'address_autofill_active',
-                        'name' => __( 'Enable/Disable', 'invoicing' ),
-                        'desc' => __( 'Enable google address auto complete', 'invoicing' ),
+                        'name' => __('Enable/Disable', 'invoicing'),
+                        'desc' => __('Enable google address auto complete', 'invoicing'),
                         'type' => 'checkbox',
                         'std'  => 0
                     ),
                     'address_autofill_api' => array(
                         'id' => 'address_autofill_api',
-                        'name' => __( 'Google Place API Key', 'invoicing' ),
-                        'desc' => wp_sprintf(__( 'Enter google place API key. For more information go to google place API %sdocumenation%s', 'invoicing' ), '<a href="https://developers.google.com/maps/documentation/javascript/places-autocomplete" target="_blank">', '</a>' ),
+                        'name' => __('Google Place API Key', 'invoicing'),
+                        'desc' => wp_sprintf(__('Enter google place API key. For more information go to google place API %sdocumenation%s', 'invoicing'), '<a href="https://developers.google.com/maps/documentation/javascript/places-autocomplete" target="_blank">', '</a>'),
                         'type' => 'text',
                         'size' => 'regular',
                         'std' => ''
@@ -704,8 +704,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',
                     ),
                 ),
@@ -713,135 +713,135 @@ 
         )
     );
 
-    return apply_filters( 'wpinv_registered_settings', $wpinv_settings );
+    return apply_filters('wpinv_registered_settings', $wpinv_settings);
 }
 
-function wpinv_settings_sanitize( $input = array() ) {
+function wpinv_settings_sanitize($input = array()) {
     global $wpinv_options;
 
-    if ( empty( $_POST['_wp_http_referer'] ) ) {
+    if (empty($_POST['_wp_http_referer'])) {
         return $input;
     }
 
-    parse_str( $_POST['_wp_http_referer'], $referrer );
+    parse_str($_POST['_wp_http_referer'], $referrer);
 
     $settings = wpinv_get_registered_settings();
-    $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
-    $section  = isset( $referrer['section'] ) ? $referrer['section'] : 'main';
+    $tab      = isset($referrer['tab']) ? $referrer['tab'] : 'general';
+    $section  = isset($referrer['section']) ? $referrer['section'] : 'main';
 
     $input = $input ? $input : array();
-    $input = apply_filters( 'wpinv_settings_tab_' . $tab . '_sanitize', $input );
-    $input = apply_filters( 'wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input );
+    $input = apply_filters('wpinv_settings_tab_' . $tab . '_sanitize', $input);
+    $input = apply_filters('wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input);
 
     // Loop through each setting being saved and pass it through a sanitization filter
-    foreach ( $input as $key => $value ) {
+    foreach ($input as $key => $value) {
         // Get the setting type (checkbox, select, etc)
-        $type = isset( $settings[ $tab ][ $key ]['type'] ) ? $settings[ $tab ][ $key ]['type'] : false;
+        $type = isset($settings[$tab][$key]['type']) ? $settings[$tab][$key]['type'] : false;
 
-        if ( $type ) {
+        if ($type) {
             // Field type specific filter
-            $input[$key] = apply_filters( 'wpinv_settings_sanitize_' . $type, $value, $key );
+            $input[$key] = apply_filters('wpinv_settings_sanitize_' . $type, $value, $key);
         }
 
         // General filter
-        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[$key] = apply_filters('wpinv_settings_sanitize', $input[$key], $key);
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
-    $main_settings    = $section == 'main' ? $settings[ $tab ] : array(); // Check for extensions that aren't using new sections
-    $section_settings = ! empty( $settings[ $tab ][ $section ] ) ? $settings[ $tab ][ $section ] : array();
+    $main_settings    = $section == 'main' ? $settings[$tab] : array(); // Check for extensions that aren't using new sections
+    $section_settings = !empty($settings[$tab][$section]) ? $settings[$tab][$section] : array();
 
-    $found_settings = array_merge( $main_settings, $section_settings );
+    $found_settings = array_merge($main_settings, $section_settings);
 
-    if ( ! empty( $found_settings ) ) {
-        foreach ( $found_settings as $key => $value ) {
+    if (!empty($found_settings)) {
+        foreach ($found_settings as $key => $value) {
 
             // settings used to have numeric keys, now they have keys that match the option ID. This ensures both methods work
-            if ( is_numeric( $key ) ) {
+            if (is_numeric($key)) {
                 $key = $value['id'];
             }
 
-            if ( empty( $input[ $key ] ) ) {
-                unset( $wpinv_options[ $key ] );
+            if (empty($input[$key])) {
+                unset($wpinv_options[$key]);
             }
         }
     }
 
     // Merge our new settings with the existing
-    $output = array_merge( $wpinv_options, $input );
+    $output = array_merge($wpinv_options, $input);
 
-    add_settings_error( 'wpinv-notices', '', __( 'Settings updated.', 'invoicing' ), 'updated' );
+    add_settings_error('wpinv-notices', '', __('Settings updated.', 'invoicing'), 'updated');
 
     return $output;
 }
 
-function wpinv_settings_sanitize_misc_accounting( $input ) {
+function wpinv_settings_sanitize_misc_accounting($input) {
     global $wpinv_options, $wpi_session;
 
-    if ( !current_user_can( 'manage_options' ) ) {
+    if (!current_user_can('manage_options')) {
         return $input;
     }
 
-    if( ! empty( $input['enable_sequential'] ) && !wpinv_get_option( 'enable_sequential' ) ) {
+    if (!empty($input['enable_sequential']) && !wpinv_get_option('enable_sequential')) {
         // Shows an admin notice about upgrading previous order numbers
-        $wpi_session->set( 'upgrade_sequential', '1' );
+        $wpi_session->set('upgrade_sequential', '1');
     }
 
     return $input;
 }
-add_filter( 'wpinv_settings_misc-accounting_sanitize', 'wpinv_settings_sanitize_misc_accounting' );
+add_filter('wpinv_settings_misc-accounting_sanitize', 'wpinv_settings_sanitize_misc_accounting');
 
-function wpinv_settings_sanitize_tax_rates( $input ) {
-    if( !current_user_can( 'manage_options' ) ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!current_user_can('manage_options')) {
         return $input;
     }
 
-    $new_rates = !empty( $_POST['tax_rates'] ) ? array_values( $_POST['tax_rates'] ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? array_values($_POST['tax_rates']) : array();
 
     $tax_rates = array();
 
-    if ( !empty( $new_rates ) ) {
-        foreach ( $new_rates as $rate ) {
-            if ( isset( $rate['country'] ) && empty( $rate['country'] ) && empty( $rate['state'] ) ) {
+    if (!empty($new_rates)) {
+        foreach ($new_rates as $rate) {
+            if (isset($rate['country']) && empty($rate['country']) && empty($rate['state'])) {
                 continue;
             }
             
-            $rate['rate'] = wpinv_sanitize_amount( $rate['rate'], 4 );
+            $rate['rate'] = wpinv_sanitize_amount($rate['rate'], 4);
             
             $tax_rates[] = $rate;
         }
     }
 
-    update_option( 'wpinv_tax_rates', $tax_rates );
+    update_option('wpinv_tax_rates', $tax_rates);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates' );
+add_filter('wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates');
 
-function wpinv_sanitize_text_field( $input ) {
-    return trim( $input );
+function wpinv_sanitize_text_field($input) {
+    return trim($input);
 }
-add_filter( 'wpinv_settings_sanitize_text', 'wpinv_sanitize_text_field' );
+add_filter('wpinv_settings_sanitize_text', 'wpinv_sanitize_text_field');
 
 function wpinv_get_settings_tabs() {
     $tabs             = array();
-    $tabs['general']  = __( 'General', 'invoicing' );
-    $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
-    $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-    $tabs['emails']   = __( 'Emails', 'invoicing' );
-    $tabs['misc']     = __( 'Misc', 'invoicing' );
-    $tabs['tools']    = __( 'Tools', 'invoicing' );
-
-    return apply_filters( 'wpinv_settings_tabs', $tabs );
+    $tabs['general']  = __('General', 'invoicing');
+    $tabs['gateways'] = __('Payment Gateways', 'invoicing');
+    $tabs['taxes']    = __('Taxes', 'invoicing');
+    $tabs['emails']   = __('Emails', 'invoicing');
+    $tabs['misc']     = __('Misc', 'invoicing');
+    $tabs['tools']    = __('Tools', 'invoicing');
+
+    return apply_filters('wpinv_settings_tabs', $tabs);
 }
 
-function wpinv_get_settings_tab_sections( $tab = false ) {
+function wpinv_get_settings_tab_sections($tab = false) {
     $tabs     = false;
     $sections = wpinv_get_registered_settings_sections();
 
-    if( $tab && ! empty( $sections[ $tab ] ) ) {
-        $tabs = $sections[ $tab ];
-    } else if ( $tab ) {
+    if ($tab && !empty($sections[$tab])) {
+        $tabs = $sections[$tab];
+    } else if ($tab) {
         $tabs = false;
     }
 
@@ -851,136 +851,136 @@ 
 function wpinv_get_registered_settings_sections() {
     static $sections = false;
 
-    if ( false !== $sections ) {
+    if (false !== $sections) {
         return $sections;
     }
 
     $sections = array(
-        'general' => apply_filters( 'wpinv_settings_sections_general', array(
-            'main' => __( 'General Settings', 'invoicing' ),
-            'currency_section' => __( 'Currency Settings', 'invoicing' ),
-            'labels' => __( 'Label Texts', 'invoicing' ),
-        ) ),
-        'gateways' => apply_filters( 'wpinv_settings_sections_gateways', array(
-            'main' => __( 'Gateway Settings', 'invoicing' ),
-        ) ),
-        'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
-            'main' => __( 'Tax Settings', 'invoicing' ),
-            'rates' => __( 'Tax Rates', 'invoicing' ),
-        ) ),
-        'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
-            'main' => __( 'Email Settings', 'invoicing' ),
-        ) ),
-        'misc' => apply_filters( 'wpinv_settings_sections_misc', array(
-            'main' => __( 'Miscellaneous', 'invoicing' ),
-            'fields' => __( 'Fields Settings', 'invoicing' ),
-        ) ),
-        'tools' => apply_filters( 'wpinv_settings_sections_tools', array(
-            'main' => __( 'Diagnostic Tools', 'invoicing' ),
-        ) ),
+        'general' => apply_filters('wpinv_settings_sections_general', array(
+            'main' => __('General Settings', 'invoicing'),
+            'currency_section' => __('Currency Settings', 'invoicing'),
+            'labels' => __('Label Texts', 'invoicing'),
+        )),
+        'gateways' => apply_filters('wpinv_settings_sections_gateways', array(
+            'main' => __('Gateway Settings', 'invoicing'),
+        )),
+        'taxes' => apply_filters('wpinv_settings_sections_taxes', array(
+            'main' => __('Tax Settings', 'invoicing'),
+            'rates' => __('Tax Rates', 'invoicing'),
+        )),
+        'emails' => apply_filters('wpinv_settings_sections_emails', array(
+            'main' => __('Email Settings', 'invoicing'),
+        )),
+        'misc' => apply_filters('wpinv_settings_sections_misc', array(
+            'main' => __('Miscellaneous', 'invoicing'),
+            'fields' => __('Fields Settings', 'invoicing'),
+        )),
+        'tools' => apply_filters('wpinv_settings_sections_tools', array(
+            'main' => __('Diagnostic Tools', 'invoicing'),
+        )),
     );
 
-    $sections = apply_filters( 'wpinv_settings_sections', $sections );
+    $sections = apply_filters('wpinv_settings_sections', $sections);
 
     return $sections;
 }
 
-function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
+function wpinv_get_pages($with_slug = false, $default_label = NULL) {
 	$pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
+	if ($default_label !== NULL && $default_label !== false) {
+		$pages_options = array('' => $default_label); // Blank option
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
+	if ($pages) {
+		foreach ($pages as $page) {
 			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
-            $pages_options[ $page->ID ] = $title;
+            $pages_options[$page->ID] = $title;
 		}
 	}
 
 	return $pages_options;
 }
 
-function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
         echo $args['desc'];
     }
 }
 
-function wpinv_hidden_callback( $args ) {
+function wpinv_hidden_callback($args) {
 	global $wpinv_options;
 
-	if ( isset( $args['set_value'] ) ) {
+	if (isset($args['set_value'])) {
 		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	} elseif (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key($args['id']) . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '" />';
     
 	echo $html;
 }
 
-function wpinv_checkbox_callback( $args ) {
+function wpinv_checkbox_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$name = '';
 	} else {
 		$name = 'name="wpinv_settings[' . $sanitize_id . ']"';
 	}
 
-	$checked = isset( $wpinv_options[ $args['id'] ] ) ? checked( 1, $wpinv_options[ $args['id'] ], false ) : '';
+	$checked = isset($wpinv_options[$args['id']]) ? checked(1, $wpinv_options[$args['id']], false) : '';
 	$html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_multicheck_callback( $args ) {
+function wpinv_multicheck_callback($args) {
 	global $wpinv_options;
 	
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
+	$sanitize_id = wpinv_sanitize_key($args['id']);
 	
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option):
+			$sanitize_key = wpinv_sanitize_key($key);
+			if (isset($wpinv_options[$args['id']][$sanitize_key])) { 
 				$enabled = $sanitize_key;
 			} else { 
 				$enabled = NULL; 
 			}
-			echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label><br/>';
+			echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($sanitize_key) . '" ' . checked($sanitize_key, $enabled, false) . '/>&nbsp;';
+			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post($option) . '</label><br/>';
 		endforeach;
 		echo '<p class="description">' . $args['desc'] . '</p>';
 	}
 }
 
-function wpinv_payment_icons_callback( $args ) {
+function wpinv_payment_icons_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
-            $sanitize_key = wpinv_sanitize_key( $key );
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option) {
+            $sanitize_key = wpinv_sanitize_key($key);
             
-			if( isset( $wpinv_options[$args['id']][$key] ) ) {
+			if (isset($wpinv_options[$args['id']][$key])) {
 				$enabled = $option;
 			} else {
 				$enabled = NULL;
@@ -988,196 +988,196 @@ 
 
 			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
 
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				if (wpinv_string_is_image_url($key)) {
+					echo '<img class="payment-icon" src="' . esc_url($key) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
+					$card = strtolower(str_replace(' ', '', $option));
 
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+					if (has_filter('wpinv_accepted_payment_' . $card . '_image')) {
+						$image = apply_filters('wpinv_accepted_payment_' . $card . '_image', '');
 					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+						$image       = wpinv_locate_template('images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false);
 						$content_dir = WP_CONTENT_DIR;
 
-						if ( function_exists( 'wp_normalize_path' ) ) {
+						if (function_exists('wp_normalize_path')) {
 							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
+							$image = wp_normalize_path($image);
+							$content_dir = wp_normalize_path($content_dir);
 						}
 
-						$image = str_replace( $content_dir, content_url(), $image );
+						$image = str_replace($content_dir, content_url(), $image);
 					}
 
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+					echo '<img class="payment-icon" src="' . esc_url($image) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				}
 			echo $option . '</label>';
 		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
-function wpinv_radio_callback( $args ) {
+function wpinv_radio_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
     
-    foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+    foreach ($args['options'] as $key => $option) :
+		$sanitize_key = wpinv_sanitize_key($key);
         
         $checked = false;
 
-		if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
+		if (isset($wpinv_options[$args['id']]) && $wpinv_options[$args['id']] == $key)
 			$checked = true;
-		elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
+		elseif (isset($args['std']) && $args['std'] == $key && !isset($wpinv_options[$args['id']]))
 			$checked = true;
 
 		echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
+		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html($option) . '</label><br/>';
 	endforeach;
 
-	echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+	echo '<p class="description">' . wp_kses_post($args['desc']) . '</p>';
 }
 
-function wpinv_gateways_callback( $args ) {
+function wpinv_gateways_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+	foreach ($args['options'] as $key => $option) :
+		$sanitize_key = wpinv_sanitize_key($key);
         
-        if ( isset( $wpinv_options['gateways'][ $key ] ) )
+        if (isset($wpinv_options['gateways'][$key]))
 			$enabled = '1';
 		else
 			$enabled = null;
 
-		echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
+		echo '<input name="wpinv_settings[' . esc_attr($args['id']) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
+		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html($option['admin_label']) . '</label><br/>';
 	endforeach;
 }
 
 function wpinv_gateway_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
 	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']">';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
-            $selected = selected( $key, $args['selected'], false );
+	foreach ($args['options'] as $key => $option) :
+		if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
+            $selected = selected($key, $args['selected'], false);
         } else {
-            $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], false ) : '';
+            $selected = isset($wpinv_options[$args['id']]) ? selected($key, $wpinv_options[$args['id']], false) : '';
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+		echo '<option value="' . wpinv_sanitize_key($key) . '"' . $selected . '>' . esc_html($option['admin_label']) . '</option>';
 	endforeach;
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 }
 
-function wpinv_text_callback( $args ) {
+function wpinv_text_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+	$class = !empty($args['class']) ? sanitize_html_class($args['class']) : '';
 
 	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
-	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
-	$html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$size     = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html     = '<input type="text" class="' . sanitize_html_class($size) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '"' . $readonly . '/>';
+	$html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_number_callback( $args ) {
+function wpinv_number_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$max  = isset( $args['max'] ) ? $args['max'] : 999999;
-	$min  = isset( $args['min'] ) ? $args['min'] : 0;
-	$step = isset( $args['step'] ) ? $args['step'] : 1;
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+	$max  = isset($args['max']) ? $args['max'] : 999999;
+	$min  = isset($args['min']) ? $args['min'] : 0;
+	$step = isset($args['step']) ? $args['step'] : 1;
+	$class = !empty($args['class']) ? sanitize_html_class($args['class']) : '';
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="number" step="' . esc_attr($step) . '" max="' . esc_attr($max) . '" min="' . esc_attr($min) . '" class="' . sanitize_html_class($size) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '"/>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_textarea_callback( $args ) {
+function wpinv_textarea_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
     
-    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $class = (isset($args['class']) && !is_null($args['class'])) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<textarea class="' . sanitize_html_class($class) . ' txtarea-' . sanitize_html_class($size) . ' wpi-' . esc_attr(sanitize_html_class($sanitize_id)) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']">' . esc_textarea(stripslashes($value)) . '</textarea>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_password_callback( $args ) {
+function wpinv_password_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="password" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '"/>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
 function wpinv_missing_callback($args) {
 	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+		__('The callback function used for the %s setting is missing.', 'invoicing'),
 		'<strong>' . $args['id'] . '</strong>'
 	);
 }
@@ -1185,137 +1185,137 @@ 
 function wpinv_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
     
-    if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
         $value = $args['selected'];
     }
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
 	}
 
-	if ( isset( $args['chosen'] ) ) {
+	if (isset($args['chosen'])) {
 		$chosen = 'class="wpinv-chosen"';
 	} else {
 		$chosen = '';
 	}
     
-    if( !empty( $args['onchange'] ) ) {
-        $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $onchange = ' onchange="' . esc_attr($args['onchange']) . '"';
     } else {
         $onchange = '';
     }
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" ' . $chosen . 'data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" ' . $chosen . 'data-placeholder="' . esc_html($placeholder) . '"' . $onchange . ' />';
 
-	foreach ( $args['options'] as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+	foreach ($args['options'] as $option => $name) {
+		$selected = selected($option, $value, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($name) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_color_select_callback( $args ) {
+function wpinv_color_select_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+	foreach ($args['options'] as $option => $color) {
+		$selected = selected($option, $value, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($color['label']) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_rich_editor_callback( $args ) {
+function wpinv_rich_editor_callback($args) {
 	global $wpinv_options, $wp_version;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 
-		if( empty( $args['allow_blank'] ) && empty( $value ) ) {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
+		if (empty($args['allow_blank']) && empty($value)) {
+			$value = isset($args['std']) ? $args['std'] : '';
 		}
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+	$rows = isset($args['size']) ? $args['size'] : 20;
 
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+	if ($wp_version >= 3.3 && function_exists('wp_editor')) {
 		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ) ) );
+		wp_editor(stripslashes($value), 'wpinv_settings_' . esc_attr($args['id']), array('textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']', 'textarea_rows' => absint($rows)));
 		$html = ob_get_clean();
 	} else {
-		$html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+		$html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="wpi-' . esc_attr(sanitize_html_class($args['id'])) . '">' . esc_textarea(stripslashes($value)) . '</textarea>';
 	}
 
-	$html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_upload_callback( $args ) {
+function wpinv_upload_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+	if (isset($wpinv_options[$args['id']])) {
 		$value = $wpinv_options[$args['id']];
 	} else {
 		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="text" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr(stripslashes($value)) . '"/>';
+	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __('Upload File', 'invoicing') . '"/></span>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_color_callback( $args ) {
+function wpinv_color_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+	if (isset($wpinv_options[$args['id']])) {
+		$value = $wpinv_options[$args['id']];
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$default = isset( $args['std'] ) ? $args['std'] : '';
+	$default = isset($args['std']) ? $args['std'] : '';
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '" data-default-color="' . esc_attr($default) . '" />';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
@@ -1323,9 +1323,9 @@ 
 function wpinv_country_states_callback($args) {
 	global $wpinv_options;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
@@ -1333,17 +1333,17 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$chosen = ( $args['chosen'] ? ' wpinv-chosen' : '' );
-	$class = empty( $states ) ? ' class="wpinv-no-states' . $chosen . '"' : 'class="' . $chosen . '"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$chosen = ($args['chosen'] ? ' wpinv-chosen' : '');
+	$class = empty($states) ? ' class="wpinv-no-states' . $chosen . '"' : 'class="' . $chosen . '"';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"' . $class . 'data-placeholder="' . esc_html($placeholder) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+	foreach ($states as $option => $name) {
+		$selected = isset($wpinv_options[$args['id']]) ? selected($option, $wpinv_options[$args['id']], false) : '';
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($name) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
@@ -1358,25 +1358,25 @@ 
 	<table id="wpinv_tax_rates" class="wp-list-table widefat fixed posts">
 		<thead>
 			<tr>
-				<th scope="col" class="wpinv_tax_country"><?php _e( 'Country', 'invoicing' ); ?></th>
-				<th scope="col" class="wpinv_tax_state"><?php _e( 'State / Province', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_tax_global" title="<?php esc_attr_e( 'Apply rate to whole country, regardless of state / province', 'invoicing' ); ?>"><?php _e( 'Country Wide', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv_tax_rate"><?php _e( 'Rate %', 'invoicing' ); ?></th> 
-                <th scope="col" class="wpinv_tax_name"><?php _e( 'Tax Name', 'invoicing' ); ?></th>
-				<th scope="col" class="wpinv_tax_action"><?php _e( 'Remove', 'invoicing' ); ?></th>
+				<th scope="col" class="wpinv_tax_country"><?php _e('Country', 'invoicing'); ?></th>
+				<th scope="col" class="wpinv_tax_state"><?php _e('State / Province', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_tax_global" title="<?php esc_attr_e('Apply rate to whole country, regardless of state / province', 'invoicing'); ?>"><?php _e('Country Wide', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv_tax_rate"><?php _e('Rate %', 'invoicing'); ?></th> 
+                <th scope="col" class="wpinv_tax_name"><?php _e('Tax Name', 'invoicing'); ?></th>
+				<th scope="col" class="wpinv_tax_action"><?php _e('Remove', 'invoicing'); ?></th>
 			</tr>
 		</thead>
         <tbody>
-		<?php if( !empty( $rates ) ) : ?>
-			<?php foreach( $rates as $key => $rate ) : ?>
+		<?php if (!empty($rates)) : ?>
+			<?php foreach ($rates as $key => $rate) : ?>
             <?php 
-            $sanitized_key = wpinv_sanitize_key( $key );
+            $sanitized_key = wpinv_sanitize_key($key);
             ?>
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
+					echo wpinv_html_select(array(
+						'options'          => wpinv_get_country_list(true),
 						'name'             => 'tax_rates[' . $sanitized_key . '][country]',
                         'id'               => 'tax_rates[' . $sanitized_key . '][country]',
 						'selected'         => $rate['country'],
@@ -1384,72 +1384,72 @@ 
 						'show_option_none' => false,
 						'class'            => 'wpinv-tax-country',
 						'chosen'           => false,
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) );
+						'placeholder'      => __('Choose a country', 'invoicing')
+					));
 					?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php
-					$states = wpinv_get_country_states( $rate['country'] );
-					if( !empty( $states ) ) {
-						echo wpinv_html_select( array(
-							'options'          => array_merge( array( '' => '' ), $states ),
+					$states = wpinv_get_country_states($rate['country']);
+					if (!empty($states)) {
+						echo wpinv_html_select(array(
+							'options'          => array_merge(array('' => ''), $states),
 							'name'             => 'tax_rates[' . $sanitized_key . '][state]',
                             'id'               => 'tax_rates[' . $sanitized_key . '][state]',
 							'selected'         => $rate['state'],
 							'show_option_all'  => false,
 							'show_option_none' => false,
 							'chosen'           => false,
-							'placeholder'      => __( 'Choose a state', 'invoicing' )
-						) );
+							'placeholder'      => __('Choose a state', 'invoicing')
+						));
 					} else {
-						echo wpinv_html_text( array(
+						echo wpinv_html_text(array(
 							'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
-							'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
+							'value' => !empty($rate['state']) ? $rate['state'] : '',
                             'id'    => 'tax_rates[' . $sanitized_key . '][state]',
-						) );
+						));
 					}
 					?>
 				</td>
 				<td class="wpinv_tax_global">
-					<input type="checkbox" name="tax_rates[<?php echo $sanitized_key; ?>][global]" id="tax_rates[<?php echo $sanitized_key; ?>][global]" value="1"<?php checked( true, ! empty( $rate['global'] ) ); ?>/>
-					<label for="tax_rates[<?php echo $sanitized_key; ?>][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label>
+					<input type="checkbox" name="tax_rates[<?php echo $sanitized_key; ?>][global]" id="tax_rates[<?php echo $sanitized_key; ?>][global]" value="1"<?php checked(true, !empty($rate['global'])); ?>/>
+					<label for="tax_rates[<?php echo $sanitized_key; ?>][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label>
 				</td>
-				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[<?php echo $sanitized_key; ?>][rate]" value="<?php echo esc_html( $rate['rate'] ); ?>"/></td>
-                <td class="wpinv_tax_name"><input type="text" class="regular-text" name="tax_rates[<?php echo $sanitized_key; ?>][name]" value="<?php echo esc_html( $rate['name'] ); ?>"/></td>
-				<td class="wpinv_tax_action"><span class="wpinv_remove_tax_rate button-secondary"><?php _e( 'Remove Rate', 'invoicing' ); ?></span></td>
+				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[<?php echo $sanitized_key; ?>][rate]" value="<?php echo esc_html($rate['rate']); ?>"/></td>
+                <td class="wpinv_tax_name"><input type="text" class="regular-text" name="tax_rates[<?php echo $sanitized_key; ?>][name]" value="<?php echo esc_html($rate['name']); ?>"/></td>
+				<td class="wpinv_tax_action"><span class="wpinv_remove_tax_rate button-secondary"><?php _e('Remove Rate', 'invoicing'); ?></span></td>
 			</tr>
 			<?php endforeach; ?>
 		<?php else : ?>
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
+					echo wpinv_html_select(array(
+						'options'          => wpinv_get_country_list(true),
 						'name'             => 'tax_rates[0][country]',
 						'show_option_all'  => false,
 						'show_option_none' => false,
 						'class'            => 'wpinv-tax-country',
 						'chosen'           => false,
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) ); ?>
+						'placeholder'      => __('Choose a country', 'invoicing')
+					)); ?>
 				</td>
 				<td class="wpinv_tax_state">
-					<?php echo wpinv_html_text( array(
+					<?php echo wpinv_html_text(array(
 						'name' => 'tax_rates[0][state]'
-					) ); ?>
+					)); ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[0][global]" id="tax_rates[0][global]" value="1"/>
-					<label for="tax_rates[0][global]"><?php _e( 'Apply to whole country', 'invoicing' ); ?></label>
+					<label for="tax_rates[0][global]"><?php _e('Apply to whole country', 'invoicing'); ?></label>
 				</td>
-				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[0][rate]" placeholder="<?php echo (float)wpinv_get_option( 'tax_rate', 0 ) ;?>" value="<?php echo (float)wpinv_get_option( 'tax_rate', 0 ) ;?>"/></td>
+				<td class="wpinv_tax_rate"><input type="number" class="small-text" step="any" min="0" max="99" name="tax_rates[0][rate]" placeholder="<?php echo (float)wpinv_get_option('tax_rate', 0); ?>" value="<?php echo (float)wpinv_get_option('tax_rate', 0); ?>"/></td>
                 <td class="wpinv_tax_name"><input type="text" class="regular-text" name="tax_rates[0][name]" /></td>
-				<td><span class="wpinv_remove_tax_rate button-secondary"><?php _e( 'Remove Rate', 'invoicing' ); ?></span></td>
+				<td><span class="wpinv_remove_tax_rate button-secondary"><?php _e('Remove Rate', 'invoicing'); ?></span></td>
 			</tr>
 		<?php endif; ?>
         </tbody>
-        <tfoot><tr><td colspan="5"></td><td class="wpinv_tax_action"><span class="button-secondary" id="wpinv_add_tax_rate"><?php _e( 'Add Tax Rate', 'invoicing' ); ?></span></td></tr></tfoot>
+        <tfoot><tr><td colspan="5"></td><td class="wpinv_tax_action"><span class="button-secondary" id="wpinv_add_tax_rate"><?php _e('Add Tax Rate', 'invoicing'); ?></span></td></tr></tfoot>
 	</table>
 	<?php
 	echo ob_get_clean();
@@ -1460,54 +1460,54 @@ 
     ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tools_tdbox">
-    <?php if ( $args['desc'] ) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
-    <?php do_action( 'wpinv_tools_before' ); ?>
+    <?php if ($args['desc']) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
+    <?php do_action('wpinv_tools_before'); ?>
     <table id="wpinv_tools_table" class="wp-list-table widefat fixed posts">
         <thead>
             <tr>
-                <th scope="col" class="wpinv-th-tool"><?php _e( 'Tool', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-desc"><?php _e( 'Description', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-action"><?php _e( 'Action', 'invoicing' ); ?></th>
+                <th scope="col" class="wpinv-th-tool"><?php _e('Tool', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-desc"><?php _e('Description', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-action"><?php _e('Action', 'invoicing'); ?></th>
             </tr>
         </thead>
-            <?php do_action( 'wpinv_tools_row' ); ?>
+            <?php do_action('wpinv_tools_row'); ?>
         <tbody>
         </tbody>
     </table>
-    <?php do_action( 'wpinv_tools_after' ); ?>
+    <?php do_action('wpinv_tools_after'); ?>
     <?php
     echo ob_get_clean();
 }
 
-function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+function wpinv_descriptive_text_callback($args) {
+	echo wp_kses_post($args['desc']);
 }
 
-function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+function wpinv_hook_callback($args) {
+	do_action('wpinv_' . $args['id'], $args);
 }
 
 function wpinv_set_settings_cap() {
 	return 'manage_options';
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
-function wpinv_settings_sanitize_input( $value, $key ) {
-    if ( $key == 'tax_rate' || $key == 'eu_fallback_rate' ) {
-        $value = wpinv_sanitize_amount( $value, 4 );
+function wpinv_settings_sanitize_input($value, $key) {
+    if ($key == 'tax_rate' || $key == 'eu_fallback_rate') {
+        $value = wpinv_sanitize_amount($value, 4);
         $value = $value >= 100 ? 99 : $value;
     }
         
     return $value;
 }
-add_filter( 'wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2 );
+add_filter('wpinv_settings_sanitize', 'wpinv_settings_sanitize_input', 10, 2);
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = !empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = !empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
     
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
\ No newline at end of file
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
\ No newline at end of file