AyeCode / invoicing

includes/class-wpinv-ajax.php

Braces +1 added lines, -1 removed lines

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

Spacing +238 added lines, -238 removed lines

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

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 +154 added lines, -154 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);
 
     }
 
@@ -553,7 +553,7 @@ 
     public function create_table() {
         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,
@@ -578,9 +578,9 @@ 
         KEY customer_and_status ( customer_id, status)
         ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-        dbDelta( $sql );
+        dbDelta($sql);
 
-        update_option( $this->table_name . '_db_version', $this->version );
+        update_option($this->table_name . '_db_version', $this->version);
     }
 
 }
\ No newline at end of file

includes/class-wpinv-db.php

Spacing +39 added lines, -39 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 abstract class Wpinv_DB {
 
@@ -66,9 +66,9 @@ 
 	 * @since   1.0.0
 	 * @return  object
 	 */
-	public function get( $row_id ) {
+	public function get($row_id) {
 		global $wpdb;
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -78,10 +78,10 @@ 
 	 * @since   1.0.0
 	 * @return  object
 	 */
-	public function get_by( $column, $row_id ) {
+	public function get_by($column, $row_id) {
 		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
+		$column = esc_sql($column);
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -91,10 +91,10 @@ 
 	 * @since   1.0.0
 	 * @return  string
 	 */
-	public function get_column( $column, $row_id ) {
+	public function get_column($column, $row_id) {
 		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+		$column = esc_sql($column);
+		return $wpdb->get_var($wpdb->prepare("SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -104,11 +104,11 @@ 
 	 * @since   1.0.0
 	 * @return  string
 	 */
-	public function get_column_by( $column, $column_where, $column_value ) {
+	public function get_column_by($column, $column_where, $column_value) {
 		global $wpdb;
-		$column_where = esc_sql( $column_where );
-		$column       = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
+		$column_where = esc_sql($column_where);
+		$column       = esc_sql($column);
+		return $wpdb->get_var($wpdb->prepare("SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value));
 	}
 
 	/**
@@ -118,31 +118,31 @@ 
 	 * @since   1.0.0
 	 * @return  int
 	 */
-	public function insert( $data, $type = '' ) {
+	public function insert($data, $type = '') {
 		global $wpdb;
 
 		// Set default values
-		$data = wp_parse_args( $data, $this->get_column_defaults() );
+		$data = wp_parse_args($data, $this->get_column_defaults());
 
-		do_action( 'wpinv_pre_insert_' . $type, $data );
+		do_action('wpinv_pre_insert_' . $type, $data);
 
 		// Initialise column format array
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		$wpdb->insert( $this->table_name, $data, $column_formats );
+		$wpdb->insert($this->table_name, $data, $column_formats);
 		$wpdb_insert_id = $wpdb->insert_id;
 
-		do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
+		do_action('wpinv_post_insert_' . $type, $wpdb_insert_id, $data);
 
 		return $wpdb_insert_id;
 	}
@@ -154,18 +154,18 @@ 
 	 * @since   1.0.0
 	 * @return  bool
 	 */
-	public function update( $row_id, $data = array(), $where = '' ) {
+	public function update($row_id, $data = array(), $where = '') {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if( empty( $where ) ) {
+		if (empty($where)) {
 			$where = $this->primary_key;
 		}
 
@@ -173,16 +173,16 @@ 
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
+		if (false === $wpdb->update($this->table_name, $data, array($where => $row_id), $column_formats)) {
 			return false;
 		}
 
@@ -196,18 +196,18 @@ 
 	 * @since   1.0.0
 	 * @return  bool
 	 */
-	public function delete( $row_id = 0 ) {
+	public function delete($row_id = 0) {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
+		if (false === $wpdb->query($wpdb->prepare("DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id))) {
 			return false;
 		}
 
@@ -221,11 +221,11 @@ 
 	 * @param  string $table The table name
 	 * @return bool          If the table name exists
 	 */
-	public function table_exists( $table ) {
+	public function table_exists($table) {
 		global $wpdb;
-		$table = sanitize_text_field( $table );
+		$table = sanitize_text_field($table);
 
-		return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
+		return $wpdb->get_var($wpdb->prepare("SHOW TABLES LIKE '%s'", $table)) === $table;
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 * @return bool Returns if the customers table was installed and upgrade routine run
 	 */
 	public function installed() {
-		return $this->table_exists( $this->table_name );
+		return $this->table_exists($this->table_name);
 	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -1,7 +1,9 @@
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 abstract class Wpinv_DB {
 

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

Spacing +83 added lines, -83 removed lines

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

includes/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 +69 added lines, -69 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,51 +269,51 @@ 
      * @since       1.0.0
      * @return      void
      */
-    public function wpinv_add_update_subscription( $invoice_id, $post ) {
-        remove_action( 'save_post', __FUNCTION__ );
+    public function wpinv_add_update_subscription($invoice_id, $post) {
+        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 = new WPInv_Invoice( $invoice_id );
+        $invoice = new WPInv_Invoice($invoice_id);
 
-        if ( ! ( ! empty( $invoice->ID ) && $invoice->is_recurring() ) ) {
+        if (!(!empty($invoice->ID) && $invoice->is_recurring())) {
             return;
         }
 
-        $item    = $invoice->get_recurring( true );
-        if ( empty( $item ) ) {
+        $item = $invoice->get_recurring(true);
+        if (empty($item)) {
             return;
         }
 
-        $invoice_date       = $invoice->get_invoice_date( false );
+        $invoice_date       = $invoice->get_invoice_date(false);
         $status             = 'pending';
 
-        $period             = $item->get_recurring_period( true );
+        $period             = $item->get_recurring_period(true);
         $interval           = $item->get_recurring_interval();
         $bill_times         = (int)$item->get_recurring_limit();
         $add_period         = $interval . ' ' . $period;
         $trial_period       = '';
 
-        if ( $invoice->is_free_trial() ) {
+        if ($invoice->is_free_trial()) {
             $status         = 'trialling';
-            $trial_period   = $item->get_trial_period( true );
+            $trial_period   = $item->get_trial_period(true);
             $free_interval  = $item->get_trial_interval();
             $trial_period   = $free_interval . ' ' . $trial_period;
 
             $add_period     = $trial_period;
         }
 
-        $expiration         = date_i18n( 'Y-m-d H:i:s', strtotime( '+' . $add_period  . ' 23:59:59', strtotime( $invoice_date ) ) );
+        $expiration         = date_i18n('Y-m-d H:i:s', strtotime('+' . $add_period . ' 23:59:59', strtotime($invoice_date)));
 
         $args = array(
             'product_id'        => $item->ID,
@@ -323,7 +323,7 @@ 
             'frequency'         => $interval,
             'period'            => $period,
             'initial_amount'    => $invoice->get_total(),
-            'recurring_amount'  => $invoice->get_recurring_details( 'total' ),
+            'recurring_amount'  => $invoice->get_recurring_details('total'),
             'bill_times'        => $bill_times,
             'created'           => $invoice_date,
             'expiration'        => $expiration,
@@ -333,12 +333,12 @@ 
         );
 
         $subs_db      = new WPInv_Subscriptions_DB;
-        $subs         = $subs_db->get_subscriptions( array( 'parent_payment_id' => $invoice->ID, 'number' => 1 ) );
-        $subscription = reset( $subs );
+        $subs         = $subs_db->get_subscriptions(array('parent_payment_id' => $invoice->ID, 'number' => 1));
+        $subscription = reset($subs);
 
-        if ( empty( $subscription ) || $subscription->id <= 0 ) {
+        if (empty($subscription) || $subscription->id <= 0) {
             $subscription = new WPInv_Subscription();
-            $subscription->create( $args );
+            $subscription->create($args);
         }
     }
 }
\ No newline at end of file

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();

templates/emails/wpinv-email-invoice-details.php

Spacing +29 added lines, -29 removed lines

@@ -1,68 +1,68 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
 global $wpinv_euvat;
 
-$sent_to_admin  = !empty( $sent_to_admin ) ? true : false;
-$invoice_url = $invoice->get_view_url( true );
+$sent_to_admin = !empty($sent_to_admin) ? true : false;
+$invoice_url = $invoice->get_view_url(true);
 $use_taxes = wpinv_use_taxes();
 $vat_name = $wpinv_euvat->get_vat_name();
 
-do_action( 'wpinv_email_before_invoice_details', $invoice, $sent_to_admin ); ?>
+do_action('wpinv_email_before_invoice_details', $invoice, $sent_to_admin); ?>
 <div id="wpinv-email-details">
-    <h3 class="wpinv-details-t"><?php echo apply_filters( 'wpinv_email_details_title', __( 'Invoice Details', 'invoicing' ), $invoice ); ?></h3>
+    <h3 class="wpinv-details-t"><?php echo apply_filters('wpinv_email_details_title', __('Invoice Details', 'invoicing'), $invoice); ?></h3>
     <table class="table table-bordered table-sm">
-        <?php if ( $invoice_number = $invoice->get_number() ) { ?>
+        <?php if ($invoice_number = $invoice->get_number()) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_number_label', __( 'Invoice Number', 'invoicing' ), $invoice ); ?></td>
-                <td><a href="<?php echo esc_url( $invoice_url ) ;?>"><?php echo $invoice_number; ?></a></td>
+                <td><?php echo apply_filters('wpinv_invoice_number_label', __('Invoice Number', 'invoicing'), $invoice); ?></td>
+                <td><a href="<?php echo esc_url($invoice_url); ?>"><?php echo $invoice_number; ?></a></td>
             </tr>
         <?php } ?>
         <tr>
-            <td><?php echo apply_filters( 'wpinv_invoice_status_label', __( 'Invoice Status', 'invoicing' ), $invoice ); ?></td>
-            <td><?php echo $invoice->get_status( true ); ?></td>
+            <td><?php echo apply_filters('wpinv_invoice_status_label', __('Invoice Status', 'invoicing'), $invoice); ?></td>
+            <td><?php echo $invoice->get_status(true); ?></td>
         </tr>
-        <?php if ( $invoice->is_renewal() ) { ?>
+        <?php if ($invoice->is_renewal()) { ?>
         <tr>
-            <td><?php echo apply_filters( 'wpinv_invoice_parent_invoice_label', __( 'Parent Invoice', 'invoicing' ), $invoice ); ?></td>
-            <td><?php echo wpinv_invoice_link( $invoice->parent_invoice ); ?></td>
+            <td><?php echo apply_filters('wpinv_invoice_parent_invoice_label', __('Parent Invoice', 'invoicing'), $invoice); ?></td>
+            <td><?php echo wpinv_invoice_link($invoice->parent_invoice); ?></td>
         </tr>
         <?php } ?>
-        <?php if ( ( $gateway_title = $invoice->get_gateway_title() ) && ( $invoice->is_paid() || $invoice->is_refunded() ) ) { ?>
-            <td><?php echo apply_filters( 'wpinv_invoice_payment_method_label', __( 'Payment Method', 'invoicing' ), $invoice ); ?></td>
+        <?php if (($gateway_title = $invoice->get_gateway_title()) && ($invoice->is_paid() || $invoice->is_refunded())) { ?>
+            <td><?php echo apply_filters('wpinv_invoice_payment_method_label', __('Payment Method', 'invoicing'), $invoice); ?></td>
             <td><?php echo $gateway_title; ?></td>
         <?php } ?>
-        <?php if ( $invoice_date = $invoice->get_invoice_date( false ) ) { ?>
+        <?php if ($invoice_date = $invoice->get_invoice_date(false)) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_date_label', __( 'Invoice Date', 'invoicing' ), $invoice ); ?></td>
-                <td><?php echo wp_sprintf( '<time datetime="%s">%s</time>', date_i18n( 'c', strtotime( $invoice_date ) ), $invoice->get_invoice_date() ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_date_label', __('Invoice Date', 'invoicing'), $invoice); ?></td>
+                <td><?php echo wp_sprintf('<time datetime="%s">%s</time>', date_i18n('c', strtotime($invoice_date)), $invoice->get_invoice_date()); ?></td>
             </tr>
         <?php } ?>
-        <?php if ( wpinv_get_option( 'overdue_active' ) && $invoice->needs_payment() && ( $due_date = $invoice->get_due_date() ) ) { ?>
+        <?php if (wpinv_get_option('overdue_active') && $invoice->needs_payment() && ($due_date = $invoice->get_due_date())) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_due_date_label', __( 'Due Date', 'invoicing' ), $invoice ); ?></td>
-                <td><?php echo wp_sprintf( '<time datetime="%s">%s</time>', date_i18n( 'c', strtotime( $due_date ) ), $invoice->get_due_date( true ) ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_due_date_label', __('Due Date', 'invoicing'), $invoice); ?></td>
+                <td><?php echo wp_sprintf('<time datetime="%s">%s</time>', date_i18n('c', strtotime($due_date)), $invoice->get_due_date(true)); ?></td>
             </tr>
         <?php } ?>
-        <?php do_action( 'wpinv_email_invoice_details_after_due_date', $invoice->ID ); ?>
-        <?php if ( empty( $sent_to_admin ) && ( $owner_vat_number = $wpinv_euvat->get_vat_number() ) ) { ?>
+        <?php do_action('wpinv_email_invoice_details_after_due_date', $invoice->ID); ?>
+        <?php if (empty($sent_to_admin) && ($owner_vat_number = $wpinv_euvat->get_vat_number())) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_owner_vat_number_label', wp_sprintf( __( 'Owner %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_owner_vat_number_label', wp_sprintf(__('Owner %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></td>
                 <td><?php echo $owner_vat_number; ?></td>
             </tr>
         <?php } ?>
-        <?php if ( $use_taxes && ( $user_vat_number = $invoice->vat_number ) ) { ?>
+        <?php if ($use_taxes && ($user_vat_number = $invoice->vat_number)) { ?>
             <tr>
-                <td><?php echo apply_filters( 'wpinv_invoice_user_vat_number_label', wp_sprintf( __( 'Invoice %s Number', 'invoicing' ), $vat_name ), $invoice, $vat_name ); ?></td>
+                <td><?php echo apply_filters('wpinv_invoice_user_vat_number_label', wp_sprintf(__('Invoice %s Number', 'invoicing'), $vat_name), $invoice, $vat_name); ?></td>
                 <td><?php echo $user_vat_number; ?></td>
             </tr>
         <?php } ?>
         <tr class="table-active">
-            <td><strong><?php _e( 'Total Amount', 'invoicing' ) ?></strong></td>
-            <td><strong><?php echo $invoice->get_total( true ); ?></strong></td>
+            <td><strong><?php _e('Total Amount', 'invoicing') ?></strong></td>
+            <td><strong><?php echo $invoice->get_total(true); ?></strong></td>
         </tr>
     </table>
 </div>
-<?php do_action( 'wpinv_email_after_invoice_details', $invoice, $sent_to_admin ); ?>
\ No newline at end of file
+<?php do_action('wpinv_email_after_invoice_details', $invoice, $sent_to_admin); ?>
\ No newline at end of file

includes/wpinv-payment-functions.php

Spacing +75 added lines, -75 removed lines

@@ -1,156 +1,156 @@ 
 <?php
 
-function wpinv_is_subscription_payment( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_is_subscription_payment($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
         
-    if ( $invoice->is_renewal() ) {
+    if ($invoice->is_renewal()) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_link_transaction_id($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+    return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
 }
 
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
-        $amount = __( 'Free', 'invoicing' );
+    if ($trial_interval > 0 && !empty($trial_period)) {
+        $amount = __('Free', 'invoicing');
         $interval = $trial_interval;
         $period = $trial_period;
     }
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $description = wp_sprintf( _n( '%s for the first day.', '%s for the first %d days.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first day.', '%s for the first %d days.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'W' :
         case 'week' :
-            $description = wp_sprintf( _n( '%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'M' :
         case 'month' :
-            $description = wp_sprintf( _n( '%s for the first month.', '%s for the first %d months.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first month.', '%s for the first %d months.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'Y' :
         case 'year' :
-            $description = wp_sprintf( _n( '%s for the first year.', '%s for the first %d years.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first year.', '%s for the first %d years.', $interval, 'invoicing'), $amount, $interval);
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval  );
+    return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
     $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d days, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d days, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d days.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d days.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'W' :
         case 'week' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d weeks, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d weeks, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d weeks.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d weeks.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each week.', '%s for each %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each week.', '%s for each %d weeks.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'M' :
         case 'month' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d months, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d months, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d months.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d months.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each month.', '%s for each %d months.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each month.', '%s for each %d months.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'Y' :
         case 'year' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d years, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d years, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d years.', 'invoicing'), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d years.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each year.', '%s for each %d years.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each year.', '%s for each %d years.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_payment_desc( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_subscription_payment_desc($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $description = '';
-    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-        if ( $item->has_free_trial() ) {
+    if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
+        if ($item->has_free_trial()) {
             $trial_period = $item->get_trial_period();
             $trial_interval = $item->get_trial_interval();
         } else {
@@ -158,45 +158,45 @@ 
             $trial_interval = 0;
         }
         
-        $description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
+        $description = wpinv_get_billing_cycle($invoice->get_total(), $invoice->get_recurring_details('total'), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency());
     }
     
-    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+    return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
 }
 
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-    $initial_total      = wpinv_round_amount( $initial );
-    $recurring_total    = wpinv_round_amount( $recurring );
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
+    $initial_total      = wpinv_round_amount($initial);
+    $recurring_total    = wpinv_round_amount($recurring);
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
+    if ($trial_interval > 0 && !empty($trial_period)) {
         // Free trial
     } else {
-        if ( $bill_times == 1 ) {
+        if ($bill_times == 1) {
             $recurring_total = $initial_total;
-        } else if ( $bill_times > 1 && $initial_total != $recurring_total ) {
+        } else if ($bill_times > 1 && $initial_total != $recurring_total) {
             $bill_times--;
         }
     }
     
-    $initial_amount     = wpinv_price( wpinv_format_amount( $initial_total ), $currency );
-    $recurring_amount   = wpinv_price( wpinv_format_amount( $recurring_total ), $currency );
+    $initial_amount     = wpinv_price(wpinv_format_amount($initial_total), $currency);
+    $recurring_amount   = wpinv_price(wpinv_format_amount($recurring_total), $currency);
     
-    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
         
-    if ( $initial_total != $recurring_total ) {
-        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+    if ($initial_total != $recurring_total) {
+        $initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
         
-        $description    = wp_sprintf( __( '%s Then %s', 'invoicing' ), $initial, $recurring );
+        $description    = wp_sprintf(__('%s Then %s', 'invoicing'), $initial, $recurring);
     } else {
         $description    = $recurring;
     }
     
-    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+    return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
 }
 
-function wpinv_recurring_send_payment_failed( $invoice ) {
-    if ( !empty( $invoice->ID ) ) {
-        wpinv_failed_invoice_notification( $invoice->ID );
+function wpinv_recurring_send_payment_failed($invoice) {
+    if (!empty($invoice->ID)) {
+        wpinv_failed_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1 );
\ No newline at end of file
+add_action('wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1);
\ No newline at end of file

includes/wpinv-tax-functions.php

Spacing +164 added lines, -164 removed lines

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