AyeCode / invoicing

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetSOAP.php

Spacing +6 added lines, -6 removed lines

@@ -51,10 +51,10 @@ 
         $string = "";
         $types = $this->__getTypes();
         foreach ($types as $type) {
-            if (preg_match("/struct /",$type)) {
-                $type = preg_replace("/struct /","class ",$type);
-                $type = preg_replace("/ (\w+) (\w+);/","    // $1\n    public \$$2;",$type);
-                $string .= $type ."\n";
+            if (preg_match("/struct /", $type)) {
+                $type = preg_replace("/struct /", "class ", $type);
+                $type = preg_replace("/ (\w+) (\w+);/", "    // $1\n    public \$$2;", $type);
+                $string .= $type . "\n";
             }
         }
         return $string;
@@ -84,13 +84,13 @@ 
      */
     public function saveSoapDocumentation($path)
     {
-        $string =  "<?php\n";
+        $string = "<?php\n";
         $string .= "/**\n";
         $string .= " * Auto generated documentation for the AuthorizeNetSOAP API.\n";
         $string .= " * Generated " . date("m/d/Y") . "\n";
         $string .= " */\n";
         $string .= "class AuthorizeNetSOAP\n";
-        $string .= "{\n" . $this->getSoapMethods() . "\n}\n\n" . $this->getSoapTypes() ."\n\n ?>";
+        $string .= "{\n" . $this->getSoapMethods() . "\n}\n\n" . $this->getSoapTypes() . "\n\n ?>";
         return file_put_contents($path, $string);
     }
     

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetDPM.php

Indentation +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
             }
             else
             {
-              echo "Sorry, an error occurred: " . htmlentities($_GET['response_reason_text']);
+                echo "Sorry, an error occurred: " . htmlentities($_GET['response_reason_text']);
             }
         }
     }

Spacing +13 added lines, -13 removed lines

@@ -57,7 +57,7 @@ 
                 else
                 {
                     // Redirect to error page.
-                    $redirect_url = $url . '?response_code='.$response->response_code . '&response_reason_text=' . $response->response_reason_text;
+                    $redirect_url = $url . '?response_code=' . $response->response_code . '&response_reason_text=' . $response->response_reason_text;
                 }
                 // Send the Javascript back to AuthorizeNet, which will redirect user back to your site.
                 echo AuthorizeNetDPM::getRelayResponseSnippet($redirect_url);
@@ -179,54 +179,54 @@ 
             -moz-box-shadow: inset 3px -3px 3px rgba(0,0,0,.5), inset 0 3px 3px rgba(255,255,255,.5), inset -3px 0 3px rgba(255,255,255,.75);
             box-shadow: inset 3px -3px 3px rgba(0,0,0,.5), inset 0 3px 3px rgba(255,255,255,.5), inset -3px 0 3px rgba(255,255,255,.75); }
         </style>
-        <form method="post" action="'.$post_url.'">
-                '.$hidden_fields.'
+        <form method="post" action="'.$post_url . '">
+                '.$hidden_fields . '
             <fieldset>
                 <div>
                     <label>Credit Card Number</label>
-                    <input type="text" class="text" size="15" name="x_card_num" value="'.($prefill ? '6011000000000012' : '').'"></input>
+                    <input type="text" class="text" size="15" name="x_card_num" value="'.($prefill ? '6011000000000012' : '') . '"></input>
                 </div>
                 <div>
                     <label>Exp.</label>
-                    <input type="text" class="text" size="4" name="x_exp_date" value="'.($prefill ? '04/17' : '').'"></input>
+                    <input type="text" class="text" size="4" name="x_exp_date" value="'.($prefill ? '04/17' : '') . '"></input>
                 </div>
                 <div>
                     <label>CCV</label>
-                    <input type="text" class="text" size="4" name="x_card_code" value="'.($prefill ? '782' : '').'"></input>
+                    <input type="text" class="text" size="4" name="x_card_code" value="'.($prefill ? '782' : '') . '"></input>
                 </div>
             </fieldset>
             <fieldset>
                 <div>
                     <label>First Name</label>
-                    <input type="text" class="text" size="15" name="x_first_name" value="'.($prefill ? 'John' : '').'"></input>
+                    <input type="text" class="text" size="15" name="x_first_name" value="'.($prefill ? 'John' : '') . '"></input>
                 </div>
                 <div>
                     <label>Last Name</label>
-                    <input type="text" class="text" size="14" name="x_last_name" value="'.($prefill ? 'Doe' : '').'"></input>
+                    <input type="text" class="text" size="14" name="x_last_name" value="'.($prefill ? 'Doe' : '') . '"></input>
                 </div>
             </fieldset>
             <fieldset>
                 <div>
                     <label>Address</label>
-                    <input type="text" class="text" size="26" name="x_address" value="'.($prefill ? '123 Main Street' : '').'"></input>
+                    <input type="text" class="text" size="26" name="x_address" value="'.($prefill ? '123 Main Street' : '') . '"></input>
                 </div>
                 <div>
                     <label>City</label>
-                    <input type="text" class="text" size="15" name="x_city" value="'.($prefill ? 'Boston' : '').'"></input>
+                    <input type="text" class="text" size="15" name="x_city" value="'.($prefill ? 'Boston' : '') . '"></input>
                 </div>
             </fieldset>
             <fieldset>
                 <div>
                     <label>State</label>
-                    <input type="text" class="text" size="4" name="x_state" value="'.($prefill ? 'MA' : '').'"></input>
+                    <input type="text" class="text" size="4" name="x_state" value="'.($prefill ? 'MA' : '') . '"></input>
                 </div>
                 <div>
                     <label>Zip Code</label>
-                    <input type="text" class="text" size="9" name="x_zip" value="'.($prefill ? '02142' : '').'"></input>
+                    <input type="text" class="text" size="9" name="x_zip" value="'.($prefill ? '02142' : '') . '"></input>
                 </div>
                 <div>
                     <label>Country</label>
-                    <input type="text" class="text" size="22" name="x_country" value="'.($prefill ? 'US' : '').'"></input>
+                    <input type="text" class="text" size="22" name="x_country" value="'.($prefill ? 'US' : '') . '"></input>
                 </div>
             </fieldset>
             <input type="submit" value="BUY" class="submit buy">

Braces +3 added lines, -6 removed lines

@@ -53,16 +53,14 @@ 
                 {
                     // Do your processing here.
                     $redirect_url = $url . '?response_code=1&transaction_id=' . $response->transaction_id; 
-                }
-                else
+                } else
                 {
                     // Redirect to error page.
                     $redirect_url = $url . '?response_code='.$response->response_code . '&response_reason_text=' . $response->response_reason_text;
                 }
                 // Send the Javascript back to AuthorizeNet, which will redirect user back to your site.
                 echo AuthorizeNetDPM::getRelayResponseSnippet($redirect_url);
-            }
-            else
+            } else
             {
                 echo "Error -- not AuthorizeNet. Check your MD5 Setting.";
             }
@@ -73,8 +71,7 @@ 
             if ($_GET['response_code'] == 1)
             {
                 echo "Thank you for your purchase! Transaction id: " . htmlentities($_GET['transaction_id']);
-            }
-            else
+            } else
             {
               echo "Sorry, an error occurred: " . htmlentities($_GET['response_reason_text']);
             }

includes/gateways/authorizenet.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;
+}
 
 add_filter( 'wpinv_authorizenet_support_subscription', '__return_true' );
 

Doc Comments +3 added lines

@@ -648,6 +648,9 @@
 }
 add_filter( 'wpinv_enabled_payment_gateways', 'wpinv_check_authorizenet_currency_support', 10, 1 );
 
+/**
+ * @param WPInv_Invoice $invoice
+ */
 function wpinv_authorizenet_link_transaction_id( $transaction_id, $invoice_id, $invoice ) {
     if ( $transaction_id == $invoice_id ) {
         $link = $transaction_id;

Spacing +268 added lines, -268 removed lines

@@ -1,60 +1,60 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_filter( 'wpinv_authorizenet_support_subscription', '__return_true' );
+add_filter('wpinv_authorizenet_support_subscription', '__return_true');
 
-function wpinv_authorizenet_cc_form( $invoice_id ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
-    $cc_owner = !empty( $invoice ) ? esc_attr( $invoice->get_user_full_name() ) : '';
+function wpinv_authorizenet_cc_form($invoice_id) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    $cc_owner = !empty($invoice) ? esc_attr($invoice->get_user_full_name()) : '';
     ?>
     <div id="authorizenet_cc_form" class="form-horizontal wpi-cc-form panel panel-default">
-        <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Card Details', 'invoicing' ) ;?></h3></div>
+        <div class="panel-heading"><h3 class="panel-title"><?php _e('Card Details', 'invoicing'); ?></h3></div>
         <div class="panel-body">
             <div class="form-group required">
-              <label for="auth-input-cc-owner" class="col-sm-3 control-label"><?php _e( 'Card Owner', 'invoicing' ) ;?></label>
+              <label for="auth-input-cc-owner" class="col-sm-3 control-label"><?php _e('Card Owner', 'invoicing'); ?></label>
               <div class="col-sm-5">
-                <input type="text" class="form-control" id="auth-input-cc-owner" placeholder="<?php esc_attr_e( 'Card Owner', 'invoicing' ) ;?>" value="<?php echo $cc_owner;?>" name="authorizenet[cc_owner]">
+                <input type="text" class="form-control" id="auth-input-cc-owner" placeholder="<?php esc_attr_e('Card Owner', 'invoicing'); ?>" value="<?php echo $cc_owner; ?>" name="authorizenet[cc_owner]">
               </div>
             </div>
             <div class="form-group required">
-              <label for="auth-input-cc-number" class="col-sm-3 control-label"><?php _e( 'Card Number', 'invoicing' ) ;?></label>
+              <label for="auth-input-cc-number" class="col-sm-3 control-label"><?php _e('Card Number', 'invoicing'); ?></label>
               <div class="col-sm-5">
-                <input type="text" class="form-control" id="auth-input-cc-number" placeholder="<?php esc_attr_e( 'Card Number', 'invoicing' ) ;?>" value="" name="authorizenet[cc_number]">
+                <input type="text" class="form-control" id="auth-input-cc-number" placeholder="<?php esc_attr_e('Card Number', 'invoicing'); ?>" value="" name="authorizenet[cc_number]">
               </div>
             </div>
             <div class="form-group required">
-              <label for="auth-input-cc-expire-date" class="col-sm-3 control-label"><?php _e( 'Card Expiry Date', 'invoicing' ) ;?></label>
+              <label for="auth-input-cc-expire-date" class="col-sm-3 control-label"><?php _e('Card Expiry Date', 'invoicing'); ?></label>
               <div class="col-sm-2">
                 <select class="form-control" id="auth-input-cc-expire-date" name="authorizenet[cc_expire_month]">
-                    <?php for ( $i = 1; $i <= 12; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>"><?php echo $value;?></option>
+                    <?php for ($i = 1; $i <= 12; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>"><?php echo $value; ?></option>
                     <?php } ?>
                 </select>
                </div>
                <div class="col-sm-3">
                 <select class="form-control" name="authorizenet[cc_expire_year]">
-                    <?php $year = date( 'Y' ); for ( $i = $year; $i <= ( $year + 10 ); $i++ ) { ?>
-                    <option value="<?php echo $i;?>"><?php echo $i;?></option>
+                    <?php $year = date('Y'); for ($i = $year; $i <= ($year + 10); $i++) { ?>
+                    <option value="<?php echo $i; ?>"><?php echo $i; ?></option>
                     <?php } ?>
                 </select>
               </div>
             </div>
             <div class="form-group required">
-              <label for="auth-input-cc-cvv2" class="col-sm-3 control-label"><?php _e( 'Card Security Code (CVV2)', 'invoicing' ) ;?></label>
+              <label for="auth-input-cc-cvv2" class="col-sm-3 control-label"><?php _e('Card Security Code (CVV2)', 'invoicing'); ?></label>
               <div class="col-sm-5">
-                <input type="text" class="form-control" id="auth-input-cc-cvv2" placeholder="<?php esc_attr_e( 'Card Security Code (CVV2)', 'invoicing' ) ;?>" value="" name="authorizenet[cc_cvv2]"">
+                <input type="text" class="form-control" id="auth-input-cc-cvv2" placeholder="<?php esc_attr_e('Card Security Code (CVV2)', 'invoicing'); ?>" value="" name="authorizenet[cc_cvv2]"">
               </div>
             </div>
       </div>
     </div>
     <?php
 }
-add_action( 'wpinv_authorizenet_cc_form', 'wpinv_authorizenet_cc_form', 10, 1 );
+add_action('wpinv_authorizenet_cc_form', 'wpinv_authorizenet_cc_form', 10, 1);
 
-function wpinv_process_authorizenet_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_authorizenet_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     // Collect payment data
@@ -72,10 +72,10 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
 
-    if ( !empty( $invoice ) ) {
-        $authorizenet_card  = !empty( $_POST['authorizenet'] ) ? $_POST['authorizenet'] : array();
+    if (!empty($invoice)) {
+        $authorizenet_card  = !empty($_POST['authorizenet']) ? $_POST['authorizenet'] : array();
         $card_defaults      = array(
             'cc_owner'          => $invoice->get_user_full_name(),
             'cc_number'         => false,
@@ -83,192 +83,192 @@ 
             'cc_expire_year'    => false,
             'cc_cvv2'           => false,
         );
-        $authorizenet_card = wp_parse_args( $authorizenet_card, $card_defaults );
+        $authorizenet_card = wp_parse_args($authorizenet_card, $card_defaults);
 
-        if ( empty( $authorizenet_card['cc_owner'] ) ) {
-            wpinv_set_error( 'empty_card_name', __( 'You must enter the name on your card!', 'invoicing'));
+        if (empty($authorizenet_card['cc_owner'])) {
+            wpinv_set_error('empty_card_name', __('You must enter the name on your card!', 'invoicing'));
         }
-        if ( empty( $authorizenet_card['cc_number'] ) ) {
-            wpinv_set_error( 'empty_card', __( 'You must enter a card number!', 'invoicing'));
+        if (empty($authorizenet_card['cc_number'])) {
+            wpinv_set_error('empty_card', __('You must enter a card number!', 'invoicing'));
         }
-        if ( empty( $authorizenet_card['cc_expire_month'] ) ) {
-            wpinv_set_error( 'empty_month', __( 'You must enter an card expiration month!', 'invoicing'));
+        if (empty($authorizenet_card['cc_expire_month'])) {
+            wpinv_set_error('empty_month', __('You must enter an card expiration month!', 'invoicing'));
         }
-        if ( empty( $authorizenet_card['cc_expire_year'] ) ) {
-            wpinv_set_error( 'empty_year', __( 'You must enter an card expiration year!', 'invoicing'));
+        if (empty($authorizenet_card['cc_expire_year'])) {
+            wpinv_set_error('empty_year', __('You must enter an card expiration year!', 'invoicing'));
         }
-        if ( empty( $authorizenet_card['cc_cvv2'] ) ) {
-            wpinv_set_error( 'empty_cvv2', __( 'You must enter a valid CVV2!', 'invoicing' ) );
+        if (empty($authorizenet_card['cc_cvv2'])) {
+            wpinv_set_error('empty_cvv2', __('You must enter a valid CVV2!', 'invoicing'));
         }
 
         $errors = wpinv_get_errors();
 
-        if ( empty( $errors ) ) {
+        if (empty($errors)) {
             $invoice_id = $invoice->ID;
             $quantities_enabled = wpinv_item_quantities_enabled();
             $use_taxes          = wpinv_use_taxes();
 
             $authorizeAIM = wpinv_authorizenet_AIM();
-            $authorizeAIM->first_name       = wpinv_utf8_substr( $invoice->get_first_name(), 0, 50 );
-            $authorizeAIM->last_name        = wpinv_utf8_substr( $invoice->get_last_name(), 0, 50 );
-            $authorizeAIM->company          = wpinv_utf8_substr( $invoice->company, 0, 50 );
-            $authorizeAIM->address          = wpinv_utf8_substr( wp_strip_all_tags( $invoice->get_address(), true ), 0, 60 );
-            $authorizeAIM->city             = wpinv_utf8_substr( $invoice->city, 0, 40 );
-            $authorizeAIM->state            = wpinv_utf8_substr( $invoice->state, 0, 40 );
-            $authorizeAIM->zip              = wpinv_utf8_substr( $invoice->zip, 0, 40 );
-            $authorizeAIM->country          = wpinv_utf8_substr( $invoice->country, 0, 60 );
-            $authorizeAIM->phone            = wpinv_utf8_substr( $invoice->phone, 0, 25 );
-            $authorizeAIM->email            = wpinv_utf8_substr( $invoice->get_email(), 0, 255 );
-            $authorizeAIM->amount           = wpinv_sanitize_amount( $invoice->get_total() );
-            $authorizeAIM->card_num         = str_replace( ' ', '', sanitize_text_field( $authorizenet_card['cc_number'] ) );
-            $authorizeAIM->exp_date         = sanitize_text_field( $authorizenet_card['cc_expire_month'] ) . sanitize_text_field( $authorizenet_card['cc_expire_year'] );
-            $authorizeAIM->card_code        = sanitize_text_field( $authorizenet_card['cc_cvv2'] );
+            $authorizeAIM->first_name       = wpinv_utf8_substr($invoice->get_first_name(), 0, 50);
+            $authorizeAIM->last_name        = wpinv_utf8_substr($invoice->get_last_name(), 0, 50);
+            $authorizeAIM->company          = wpinv_utf8_substr($invoice->company, 0, 50);
+            $authorizeAIM->address          = wpinv_utf8_substr(wp_strip_all_tags($invoice->get_address(), true), 0, 60);
+            $authorizeAIM->city             = wpinv_utf8_substr($invoice->city, 0, 40);
+            $authorizeAIM->state            = wpinv_utf8_substr($invoice->state, 0, 40);
+            $authorizeAIM->zip              = wpinv_utf8_substr($invoice->zip, 0, 40);
+            $authorizeAIM->country          = wpinv_utf8_substr($invoice->country, 0, 60);
+            $authorizeAIM->phone            = wpinv_utf8_substr($invoice->phone, 0, 25);
+            $authorizeAIM->email            = wpinv_utf8_substr($invoice->get_email(), 0, 255);
+            $authorizeAIM->amount           = wpinv_sanitize_amount($invoice->get_total());
+            $authorizeAIM->card_num         = str_replace(' ', '', sanitize_text_field($authorizenet_card['cc_number']));
+            $authorizeAIM->exp_date         = sanitize_text_field($authorizenet_card['cc_expire_month']) . sanitize_text_field($authorizenet_card['cc_expire_year']);
+            $authorizeAIM->card_code        = sanitize_text_field($authorizenet_card['cc_cvv2']);
             $authorizeAIM->invoice_num      = $invoice->ID;
 
             $item_desc = array();
-            foreach ( $invoice->get_cart_details() as $item ) {            
-                $quantity       = $quantities_enabled && !empty( $item['quantity'] ) && $item['quantity'] > 0 ? $item['quantity'] : 1;
-                $item_name      = wpinv_utf8_substr( $item['name'], 0, 31 );
-                $item_desc[]    = $item_name . ' (' . $quantity . 'x ' . wpinv_price( wpinv_format_amount( $item['item_price'] ) ) . ')';
+            foreach ($invoice->get_cart_details() as $item) {            
+                $quantity       = $quantities_enabled && !empty($item['quantity']) && $item['quantity'] > 0 ? $item['quantity'] : 1;
+                $item_name      = wpinv_utf8_substr($item['name'], 0, 31);
+                $item_desc[]    = $item_name . ' (' . $quantity . 'x ' . wpinv_price(wpinv_format_amount($item['item_price'])) . ')';
 
-                $authorizeAIM->addLineItem( $item['id'], $item_name, '', $quantity, $item['item_price'], ( $use_taxes && !empty( $item['tax'] ) && $item['tax'] > 0 ? 'Y' : 'N' ) );
+                $authorizeAIM->addLineItem($item['id'], $item_name, '', $quantity, $item['item_price'], ($use_taxes && !empty($item['tax']) && $item['tax'] > 0 ? 'Y' : 'N'));
             }
 
-            $item_desc = '#' . $invoice->get_number() . ': ' . implode( ', ', $item_desc );
+            $item_desc = '#' . $invoice->get_number() . ': ' . implode(', ', $item_desc);
 
-            if ( $use_taxes && $invoice->get_tax() > 0 ) {
-                $authorizeAIM->tax  = $invoice->get_tax();
+            if ($use_taxes && $invoice->get_tax() > 0) {
+                $authorizeAIM->tax = $invoice->get_tax();
 
-                $item_desc .= ', ' . wp_sprintf( __( 'Tax: %s', 'invoicing' ), $invoice->get_tax( true ) );
+                $item_desc .= ', ' . wp_sprintf(__('Tax: %s', 'invoicing'), $invoice->get_tax(true));
             }
 
-            if ( $invoice->get_discount() > 0 ) {
-                $item_desc .= ', ' . wp_sprintf( __( 'Discount: %s', 'invoicing' ), $invoice->get_discount( true ) );
+            if ($invoice->get_discount() > 0) {
+                $item_desc .= ', ' . wp_sprintf(__('Discount: %s', 'invoicing'), $invoice->get_discount(true));
             }
 
-            $item_description = wpinv_utf8_substr( $item_desc, 0, 255 );
-            $item_description = html_entity_decode( $item_desc , ENT_QUOTES, 'UTF-8' );
+            $item_description = wpinv_utf8_substr($item_desc, 0, 255);
+            $item_description = html_entity_decode($item_desc, ENT_QUOTES, 'UTF-8');
 
-            $authorizeAIM->description  = wpinv_utf8_substr( $item_description, 0, 255 );
+            $authorizeAIM->description = wpinv_utf8_substr($item_description, 0, 255);
 
             $is_recurring = $invoice->is_recurring(); // Recurring payment.
 
-            if ( $is_recurring ) {
+            if ($is_recurring) {
                 $authorizeAIM->recurring_billing = true;
             }
 
             try {
 
-                if ( $is_recurring ) {
+                if ($is_recurring) {
                     $trx_type = wpinv_get_option('authorizenet_transaction_type_recurring', 'authorize_only');
-                    if('authorize_capture' == $trx_type){
+                    if ('authorize_capture' == $trx_type) {
                         $response = $authorizeAIM->authorizeAndCapture();
                     } else {
                         $response = $authorizeAIM->authorizeOnly();
                     }
                 } else {
                     $trx_type = wpinv_get_option('authorizenet_transaction_type', 'authorize_capture');
-                    if('authorize_capture' == $trx_type){
+                    if ('authorize_capture' == $trx_type) {
                         $response = $authorizeAIM->authorizeAndCapture();
                     } else {
                         $response = $authorizeAIM->authorizeOnly();
                     }
                 }
 
-                if ( $response->approved || $response->held ) {
-                    if ( $response->approved ) {
-                        wpinv_update_payment_status( $invoice_id, 'publish' );
+                if ($response->approved || $response->held) {
+                    if ($response->approved) {
+                        wpinv_update_payment_status($invoice_id, 'publish');
                     }
-                    wpinv_set_payment_transaction_id( $invoice_id, $response->transaction_id );
+                    wpinv_set_payment_transaction_id($invoice_id, $response->transaction_id);
 
-                    wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'Authorize.Net payment response: %s', 'invoicing' ), $response->response_reason_text ), '', '', true );
-                    wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'Authorize.Net payment: Transaction ID %s, Transaction Type %s, Authorization Code %s', 'invoicing' ), $response->transaction_id, strtoupper( $response->transaction_type ), $response->authorization_code ), '', '', true );
+                    wpinv_insert_payment_note($invoice_id, wp_sprintf(__('Authorize.Net payment response: %s', 'invoicing'), $response->response_reason_text), '', '', true);
+                    wpinv_insert_payment_note($invoice_id, wp_sprintf(__('Authorize.Net payment: Transaction ID %s, Transaction Type %s, Authorization Code %s', 'invoicing'), $response->transaction_id, strtoupper($response->transaction_type), $response->authorization_code), '', '', true);
 
-                    do_action( 'wpinv_authorizenet_handle_response', $response, $invoice, $authorizenet_card );
+                    do_action('wpinv_authorizenet_handle_response', $response, $invoice, $authorizenet_card);
 
                     wpinv_clear_errors();
                     wpinv_empty_cart();
 
-                    wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+                    wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
                 } else {
-                    if ( !empty( $response->response_reason_text ) ) {
-                        $error = __( $response->response_reason_text, 'invoicing' );
-                    } else if ( !empty( $response->error_message ) ) {
-                        $error = __( $response->error_message, 'invoicing' );
+                    if (!empty($response->response_reason_text)) {
+                        $error = __($response->response_reason_text, 'invoicing');
+                    } else if (!empty($response->error_message)) {
+                        $error = __($response->error_message, 'invoicing');
                     } else {
-                        $error = wp_sprintf( __( 'Error data: %s', 'invoicing' ), print_r( $response, true ) );
+                        $error = wp_sprintf(__('Error data: %s', 'invoicing'), print_r($response, true));
                     } 
 
-                    $error = wp_sprintf( __( 'Authorize.Net payment error occurred. %s', 'invoicing' ), $error );
+                    $error = wp_sprintf(__('Authorize.Net payment error occurred. %s', 'invoicing'), $error);
 
-                    wpinv_set_error( 'payment_error', $error );
-                    wpinv_record_gateway_error( $error, $response );
-                    wpinv_insert_payment_note( $invoice_id, $error, '', '', true );
+                    wpinv_set_error('payment_error', $error);
+                    wpinv_record_gateway_error($error, $response);
+                    wpinv_insert_payment_note($invoice_id, $error, '', '', true);
 
-                    wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+                    wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
                 }
-            } catch ( AuthorizeNetException $e ) {
-                wpinv_set_error( 'request_error', $e->getMessage() );
-                wpinv_record_gateway_error( wp_sprintf( __( 'Authorize.Net payment error occurred. %s', 'invoicing' ), $e->getMessage() ) );
-                wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+            } catch (AuthorizeNetException $e) {
+                wpinv_set_error('request_error', $e->getMessage());
+                wpinv_record_gateway_error(wp_sprintf(__('Authorize.Net payment error occurred. %s', 'invoicing'), $e->getMessage()));
+                wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
             }
         } else {
-            wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+            wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
         }
     } else {
-        wpinv_record_gateway_error( wp_sprintf( __( 'Authorize.Net payment error occurred. Payment creation failed while processing a Authorize.Net payment. Payment data: %s', 'invoicing' ), print_r( $payment_data, true ) ), $invoice );
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_record_gateway_error(wp_sprintf(__('Authorize.Net payment error occurred. Payment creation failed while processing a Authorize.Net payment. Payment data: %s', 'invoicing'), print_r($payment_data, true)), $invoice);
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_authorizenet', 'wpinv_process_authorizenet_payment' );
+add_action('wpinv_gateway_authorizenet', 'wpinv_process_authorizenet_payment');
 
-function wpinv_authorizenet_cancel_subscription( $subscription_id = '' ) {
-    if ( empty( $subscription_id ) ) {
+function wpinv_authorizenet_cancel_subscription($subscription_id = '') {
+    if (empty($subscription_id)) {
         return false;
     }
 
     try {
         $authnetXML = wpinv_authorizenet_XML();
-        $authnetXML->ARBCancelSubscriptionRequest( array( 'subscriptionId' => $subscription_id ) );
+        $authnetXML->ARBCancelSubscriptionRequest(array('subscriptionId' => $subscription_id));
         return $authnetXML->isSuccessful();
-    } catch( Exception $e ) {
-        wpinv_error_log( $e->getMessage(), __( 'Authorize.Net cancel subscription', 'invoicing' ) );
+    } catch (Exception $e) {
+        wpinv_error_log($e->getMessage(), __('Authorize.Net cancel subscription', 'invoicing'));
     }
 
     return false;
 }
 
-function wpinv_recurring_cancel_authorizenet_subscription( $subscription, $valid = false ) {
-    if ( ! empty( $valid ) && ! empty( $subscription->profile_id ) ) {
-        return wpinv_authorizenet_cancel_subscription( $subscription->profile_id );
+function wpinv_recurring_cancel_authorizenet_subscription($subscription, $valid = false) {
+    if (!empty($valid) && !empty($subscription->profile_id)) {
+        return wpinv_authorizenet_cancel_subscription($subscription->profile_id);
     }
     
     return false;
 }
-add_action( 'wpinv_recurring_cancel_authorizenet_subscription', 'wpinv_recurring_cancel_authorizenet_subscription', 10, 2 );
+add_action('wpinv_recurring_cancel_authorizenet_subscription', 'wpinv_recurring_cancel_authorizenet_subscription', 10, 2);
 
-function wpinv_authorizenet_valid_ipn( $md5_hash, $transaction_id, $amount ) {
-    $authorizenet_md5_hash = wpinv_get_option( 'authorizenet_md5_hash' );
-    if ( empty( $authorizenet_md5_hash ) ) {
+function wpinv_authorizenet_valid_ipn($md5_hash, $transaction_id, $amount) {
+    $authorizenet_md5_hash = wpinv_get_option('authorizenet_md5_hash');
+    if (empty($authorizenet_md5_hash)) {
         return true;
     }
 
-    $compare_md5 = strtoupper( md5( $authorizenet_md5_hash . $transaction_id . $amount ) );
+    $compare_md5 = strtoupper(md5($authorizenet_md5_hash . $transaction_id . $amount));
 
-    return hash_equals( $compare_md5, $md5_hash );
+    return hash_equals($compare_md5, $md5_hash);
 }
 
 function wpinv_authorizenet_AIM() {
-    if ( !class_exists( 'AuthorizeNetException' ) ) {
-        require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/gateways/authorizenet/anet_php_sdk/AuthorizeNet.php';
+    if (!class_exists('AuthorizeNetException')) {
+        require_once plugin_dir_path(WPINV_PLUGIN_FILE) . 'includes/gateways/authorizenet/anet_php_sdk/AuthorizeNet.php';
     }
 
-    $authorizeAIM = new AuthorizeNetAIM( wpinv_get_option( 'authorizenet_login_id' ), wpinv_get_option( 'authorizenet_transaction_key' ) );
+    $authorizeAIM = new AuthorizeNetAIM(wpinv_get_option('authorizenet_login_id'), wpinv_get_option('authorizenet_transaction_key'));
 
-    if ( wpinv_is_test_mode( 'authorizenet' ) ) {
-        $authorizeAIM->setSandbox( true );
+    if (wpinv_is_test_mode('authorizenet')) {
+        $authorizeAIM->setSandbox(true);
     } else {
-        $authorizeAIM->setSandbox( false );
+        $authorizeAIM->setSandbox(false);
     }
 
     $authorizeAIM->customer_ip = wpinv_get_ip();
@@ -277,250 +277,250 @@ 
 }
 
 function wpinv_authorizenet_XML() {
-    if ( !class_exists( 'AuthnetXML' ) ) {
-        require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/gateways/authorizenet/Authorize.Net-XML/AuthnetXML.class.php';
+    if (!class_exists('AuthnetXML')) {
+        require_once plugin_dir_path(WPINV_PLUGIN_FILE) . 'includes/gateways/authorizenet/Authorize.Net-XML/AuthnetXML.class.php';
     }
     
-    $authnetXML = new AuthnetXML( wpinv_get_option( 'authorizenet_login_id' ), wpinv_get_option( 'authorizenet_transaction_key' ), (bool)wpinv_is_test_mode( 'authorizenet' ) );
+    $authnetXML = new AuthnetXML(wpinv_get_option('authorizenet_login_id'), wpinv_get_option('authorizenet_transaction_key'), (bool)wpinv_is_test_mode('authorizenet'));
     
     return $authnetXML;
 }
 
-function wpinv_authorizenet_handle_response( $response, $invoice, $card_info = array() ) {
-    if ( empty( $response ) || empty( $invoice ) ) {
+function wpinv_authorizenet_handle_response($response, $invoice, $card_info = array()) {
+    if (empty($response) || empty($invoice)) {
         return false;
     }
 
-    if ( $invoice->is_recurring() && !empty( $response->approved ) ) {
-        $subscription = wpinv_authorizenet_create_new_subscription( $invoice, $response, $card_info );
+    if ($invoice->is_recurring() && !empty($response->approved)) {
+        $subscription = wpinv_authorizenet_create_new_subscription($invoice, $response, $card_info);
         $success = false;
-        if ( wpinv_is_test_mode( 'authorizenet' ) ) {
+        if (wpinv_is_test_mode('authorizenet')) {
             $success = true;
         } else {
             $success = $subscription->isSuccessful();
         }
 
-        if ( !empty( $subscription ) && $success ) {
-            do_action( 'wpinv_recurring_post_create_subscription', $subscription, $invoice, 'authorizenet' );
+        if (!empty($subscription) && $success) {
+            do_action('wpinv_recurring_post_create_subscription', $subscription, $invoice, 'authorizenet');
 
-            wpinv_authorizenet_subscription_record_signup( $subscription, $invoice );
+            wpinv_authorizenet_subscription_record_signup($subscription, $invoice);
 
-            do_action( 'wpinv_recurring_post_record_signup', $subscription, $invoice, 'authorizenet' );
+            do_action('wpinv_recurring_post_record_signup', $subscription, $invoice, 'authorizenet');
         } else {
-            if ( isset( $subscription->messages->message ) ) {
+            if (isset($subscription->messages->message)) {
                 $error = $subscription->messages->message->code . ': ' . $subscription->messages->message->text;
-                wpinv_set_error( 'wpinv_authorize_recurring_error', $error, 'invoicing' );
+                wpinv_set_error('wpinv_authorize_recurring_error', $error, 'invoicing');
             } else {
-                $error = __( 'Your subscription cannot be created due to an error.', 'invoicing' );
-                wpinv_set_error( 'wpinv_authorize_recurring_error', $error );
+                $error = __('Your subscription cannot be created due to an error.', 'invoicing');
+                wpinv_set_error('wpinv_authorize_recurring_error', $error);
             }
 
-            wpinv_record_gateway_error( $error, $subscription );
+            wpinv_record_gateway_error($error, $subscription);
 
-            wpinv_insert_payment_note( $invoice->ID, wp_sprintf( __( 'Authorize.Net subscription error occurred. %s', 'invoicing' ), $error ), '', '', true );
+            wpinv_insert_payment_note($invoice->ID, wp_sprintf(__('Authorize.Net subscription error occurred. %s', 'invoicing'), $error), '', '', true);
         }
     }
 }
-add_action( 'wpinv_authorizenet_handle_response', 'wpinv_authorizenet_handle_response', 10, 3 );
+add_action('wpinv_authorizenet_handle_response', 'wpinv_authorizenet_handle_response', 10, 3);
 
-function wpinv_authorizenet_create_new_subscription( $invoice, $response = array(), $card_info = array() ) {
-    if ( empty( $invoice ) ) {
+function wpinv_authorizenet_create_new_subscription($invoice, $response = array(), $card_info = array()) {
+    if (empty($invoice)) {
         return false;
     }
 
-    $params = wpinv_authorizenet_generate_subscription_params( $invoice, $card_info, $response );
+    $params = wpinv_authorizenet_generate_subscription_params($invoice, $card_info, $response);
 
     try {
         $authnetXML = wpinv_authorizenet_XML();
-        $authnetXML->ARBCreateSubscriptionRequest( $params );
-    } catch( Exception $e ) {
+        $authnetXML->ARBCreateSubscriptionRequest($params);
+    } catch (Exception $e) {
         $authnetXML = array();
-        wpinv_error_log( $e->getMessage(), __( 'Authorize.Net cancel subscription', 'invoicing' ) );
+        wpinv_error_log($e->getMessage(), __('Authorize.Net cancel subscription', 'invoicing'));
     }
 
     return $authnetXML;
 }
 
-function wpinv_authorizenet_generate_subscription_params( $invoice, $card_info = array(), $response = array() ) {
-    if ( empty( $invoice ) ) {
+function wpinv_authorizenet_generate_subscription_params($invoice, $card_info = array(), $response = array()) {
+    if (empty($invoice)) {
         return false;
     }
 
-    $subscription_item = $invoice->get_recurring( true );
-    if ( empty( $subscription_item->ID ) ) {
+    $subscription_item = $invoice->get_recurring(true);
+    if (empty($subscription_item->ID)) {
         return false;
     }
 
-    $item = $invoice->get_recurring( true );
+    $item = $invoice->get_recurring(true);
 
-    if ( empty( $item ) ) {
+    if (empty($item)) {
         $name = '';
     }
 
-    if ( !( $name = $item->get_name() ) ) {
+    if (!($name = $item->get_name())) {
         $name = $item->post_name;
     }
 
-    $card_details       = wpinv_authorizenet_generate_card_info( $card_info );
+    $card_details       = wpinv_authorizenet_generate_card_info($card_info);
     $subscription_name  = $invoice->get_subscription_name();
-    $initial_amount     = wpinv_round_amount( $invoice->get_total() );
-    $recurring_amount   = wpinv_round_amount( $invoice->get_recurring_details( 'total' ) );
+    $initial_amount     = wpinv_round_amount($invoice->get_total());
+    $recurring_amount   = wpinv_round_amount($invoice->get_recurring_details('total'));
     $interval           = $subscription_item->get_recurring_interval();
     $period             = $subscription_item->get_recurring_period();
     $bill_times         = (int)$subscription_item->get_recurring_limit();
     $bill_times         = $bill_times > 0 ? $bill_times : 9999;
 
-    $time_period        = wpinv_authorizenet_get_time_period( $interval, $period );
+    $time_period        = wpinv_authorizenet_get_time_period($interval, $period);
     $interval           = $time_period['interval'];
     $period             = $time_period['period'];
 
     $current_tz = date_default_timezone_get();
-    date_default_timezone_set( 'America/Denver' ); // Set same timezone as Authorize's server (Mountain Time) to prevent conflicts.
-    $today = date( 'Y-m-d' );
-    date_default_timezone_set( $current_tz );
+    date_default_timezone_set('America/Denver'); // Set same timezone as Authorize's server (Mountain Time) to prevent conflicts.
+    $today = date('Y-m-d');
+    date_default_timezone_set($current_tz);
 
     $free_trial = $invoice->is_free_trial();
-    if ( $free_trial && $subscription_item->has_free_trial() ) {
+    if ($free_trial && $subscription_item->has_free_trial()) {
         $trial_interval    = $subscription_item->get_trial_interval();
-        $trial_period      = $subscription_item->get_trial_period( true );
+        $trial_period      = $subscription_item->get_trial_period(true);
     }
 
     $subscription = array();
     $subscription['name'] = $subscription_name;
 
     $subscription['paymentSchedule'] = array(
-        'interval'         => array( 'length' => $interval, 'unit' => $period ),
+        'interval'         => array('length' => $interval, 'unit' => $period),
         'startDate'        => $today,
         'totalOccurrences' => $bill_times,
-        'trialOccurrences' => $free_trial || ( $initial_amount != $recurring_amount ) ? 1 : 0,
+        'trialOccurrences' => $free_trial || ($initial_amount != $recurring_amount) ? 1 : 0,
     );
 
     $subscription['amount'] = $recurring_amount;
     $subscription['trialAmount'] = $initial_amount;
-    $subscription['payment'] = array( 'creditCard' => $card_details );
-    $subscription['order'] = array( 'invoiceNumber' => $invoice->ID, 'description' => '#' . $invoice->get_number() );
-    $subscription['customer'] = array( 'id' => $invoice->get_user_id(), 'email' => $invoice->get_email(), 'phoneNumber' => $invoice->phone );
+    $subscription['payment'] = array('creditCard' => $card_details);
+    $subscription['order'] = array('invoiceNumber' => $invoice->ID, 'description' => '#' . $invoice->get_number());
+    $subscription['customer'] = array('id' => $invoice->get_user_id(), 'email' => $invoice->get_email(), 'phoneNumber' => $invoice->phone);
 
     $subscription['billTo'] = array(
         'firstName' => $invoice->get_first_name(),
         'lastName'  => $invoice->get_last_name(),
         'company'   => $invoice->company,
-        'address'   => wp_strip_all_tags( $invoice->get_address(), true ),
+        'address'   => wp_strip_all_tags($invoice->get_address(), true),
         'city'      => $invoice->city,
         'state'     => $invoice->state,
         'zip'       => $invoice->zip,
         'country'   => $invoice->country,
     );
 
-    $params = array( 'subscription' => $subscription );
+    $params = array('subscription' => $subscription);
 
-    return apply_filters( 'wpinv_authorizenet_generate_subscription_params', $params, $invoice, $card_info, $response );
+    return apply_filters('wpinv_authorizenet_generate_subscription_params', $params, $invoice, $card_info, $response);
 }
 
-function wpinv_authorizenet_generate_card_info( $card_info = array() ) {
-    $card_defaults      = array(
+function wpinv_authorizenet_generate_card_info($card_info = array()) {
+    $card_defaults = array(
         'cc_owner'          => null,
         'cc_number'         => null,
         'cc_expire_month'   => null,
         'cc_expire_year'    => null,
         'cc_cvv2'           => null,
     );
-    $card_info = wp_parse_args( $card_info, $card_defaults );
+    $card_info = wp_parse_args($card_info, $card_defaults);
 
     $card_details = array(
-        'cardNumber'     => str_replace( ' ', '', sanitize_text_field( $card_info['cc_number'] ) ),
-        'expirationDate' => sanitize_text_field( $card_info['cc_expire_month'] ) . sanitize_text_field( $card_info['cc_expire_year'] ),
-        'cardCode'       => sanitize_text_field( $card_info['cc_cvv2'] ),
+        'cardNumber'     => str_replace(' ', '', sanitize_text_field($card_info['cc_number'])),
+        'expirationDate' => sanitize_text_field($card_info['cc_expire_month']) . sanitize_text_field($card_info['cc_expire_year']),
+        'cardCode'       => sanitize_text_field($card_info['cc_cvv2']),
     );
 
     return $card_details;
 }
 
-function wpinv_authorizenet_subscription_record_signup( $subscription, $invoice ) {
-    $parent_invoice_id = absint( $invoice->ID );
+function wpinv_authorizenet_subscription_record_signup($subscription, $invoice) {
+    $parent_invoice_id = absint($invoice->ID);
 
-    if( empty( $parent_invoice_id ) ) {
+    if (empty($parent_invoice_id)) {
         return;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return;
     }
 
     $subscriptionId     = (array)$subscription->subscriptionId;
-    $subscription_id    = !empty( $subscriptionId[0] ) ? $subscriptionId[0] : $parent_invoice_id;
+    $subscription_id    = !empty($subscriptionId[0]) ? $subscriptionId[0] : $parent_invoice_id;
 
-    $subscription = wpinv_get_authorizenet_subscription( $subscription, $parent_invoice_id );
+    $subscription = wpinv_get_authorizenet_subscription($subscription, $parent_invoice_id);
 
-    if ( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
     // Set payment to complete
-    wpinv_update_payment_status( $subscription->parent_payment_id, 'publish' );
+    wpinv_update_payment_status($subscription->parent_payment_id, 'publish');
     sleep(1);
-    wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'Authorize.Net Subscription ID: %s', 'invoicing' ) , $subscription_id ), '', '', true );
-    update_post_meta($parent_invoice_id,'_wpinv_subscr_profile_id', $subscription_id);
+    wpinv_insert_payment_note($parent_invoice_id, sprintf(__('Authorize.Net Subscription ID: %s', 'invoicing'), $subscription_id), '', '', true);
+    update_post_meta($parent_invoice_id, '_wpinv_subscr_profile_id', $subscription_id);
 
     $status     = 'trialling' == $subscription->status ? 'trialling' : 'active';
-    $diff_days  = absint( ( ( strtotime( $subscription->expiration ) - strtotime( $subscription->created ) ) / DAY_IN_SECONDS ) );
-    $created    = date_i18n( 'Y-m-d H:i:s' );
-    $expiration = date_i18n( 'Y-m-d 23:59:59', ( strtotime( $created ) + ( $diff_days * DAY_IN_SECONDS ) ) );
+    $diff_days  = absint(((strtotime($subscription->expiration) - strtotime($subscription->created)) / DAY_IN_SECONDS));
+    $created    = date_i18n('Y-m-d H:i:s');
+    $expiration = date_i18n('Y-m-d 23:59:59', (strtotime($created) + ($diff_days * DAY_IN_SECONDS)));
 
     // Retrieve pending subscription from database and update it's status to active and set proper profile ID
-    $subscription->update( array( 'profile_id' => $subscription_id, 'status' => $status, 'created' => $created, 'expiration' => $expiration ) );
+    $subscription->update(array('profile_id' => $subscription_id, 'status' => $status, 'created' => $created, 'expiration' => $expiration));
 }
 
-function wpinv_authorizenet_validate_checkout( $valid_data, $post ) {
-    if ( !empty( $post['wpi-gateway'] ) && $post['wpi-gateway'] == 'authorizenet' ) {
+function wpinv_authorizenet_validate_checkout($valid_data, $post) {
+    if (!empty($post['wpi-gateway']) && $post['wpi-gateway'] == 'authorizenet') {
         $error = false;
         
-        if ( empty( $post['authorizenet']['cc_owner'] ) ) {
+        if (empty($post['authorizenet']['cc_owner'])) {
             $error = true;
-            wpinv_set_error( 'empty_card_name', __( 'You must enter the name on your card!', 'invoicing'));
+            wpinv_set_error('empty_card_name', __('You must enter the name on your card!', 'invoicing'));
         }
-        if ( empty( $post['authorizenet']['cc_number'] ) ) {
+        if (empty($post['authorizenet']['cc_number'])) {
             $error = true;
-            wpinv_set_error( 'empty_card', __( 'You must enter a card number!', 'invoicing'));
+            wpinv_set_error('empty_card', __('You must enter a card number!', 'invoicing'));
         }
-        if ( empty( $post['authorizenet']['cc_expire_month'] ) ) {
+        if (empty($post['authorizenet']['cc_expire_month'])) {
             $error = true;
-            wpinv_set_error( 'empty_month', __( 'You must enter an card expiration month!', 'invoicing'));
+            wpinv_set_error('empty_month', __('You must enter an card expiration month!', 'invoicing'));
         }
-        if ( empty( $post['authorizenet']['cc_expire_year'] ) ) {
+        if (empty($post['authorizenet']['cc_expire_year'])) {
             $error = true;
-            wpinv_set_error( 'empty_year', __( 'You must enter an card expiration year!', 'invoicing'));
+            wpinv_set_error('empty_year', __('You must enter an card expiration year!', 'invoicing'));
         }
-        if ( empty( $post['authorizenet']['cc_cvv2'] ) ) {
+        if (empty($post['authorizenet']['cc_cvv2'])) {
             $error = true;
-            wpinv_set_error( 'empty_cvv2', __( 'You must enter a valid CVV2!', 'invoicing' ) );
+            wpinv_set_error('empty_cvv2', __('You must enter a valid CVV2!', 'invoicing'));
         }
 
-        if ( $error ) {
+        if ($error) {
             return;
         }
 
         $invoice = wpinv_get_invoice_cart();
 
-        if ( !empty( $invoice ) && $subscription_item = $invoice->get_recurring( true ) ) {
-            $subscription_item = $invoice->get_recurring( true );
+        if (!empty($invoice) && $subscription_item = $invoice->get_recurring(true)) {
+            $subscription_item = $invoice->get_recurring(true);
 
             $interval   = $subscription_item->get_recurring_interval();
             $period     = $subscription_item->get_recurring_period();
 
-            if ( $period == 'D' && ( $interval < 7 || $interval > 365 ) ) {
-                wpinv_set_error( 'authorizenet_subscription_error', __( 'Interval Length must be a value from 7 through 365 for day based subscriptions.', 'invoicing' ) );
+            if ($period == 'D' && ($interval < 7 || $interval > 365)) {
+                wpinv_set_error('authorizenet_subscription_error', __('Interval Length must be a value from 7 through 365 for day based subscriptions.', 'invoicing'));
             }
         }
     }
 }
-add_action( 'wpinv_checkout_error_checks', 'wpinv_authorizenet_validate_checkout', 11, 2 );
+add_action('wpinv_checkout_error_checks', 'wpinv_authorizenet_validate_checkout', 11, 2);
 
-function wpinv_authorizenet_get_time_period( $subscription_interval, $subscription_period ) {
-    $subscription_interval = absint( $subscription_interval );
+function wpinv_authorizenet_get_time_period($subscription_interval, $subscription_period) {
+    $subscription_interval = absint($subscription_interval);
 
-    switch( $subscription_period ) {
+    switch ($subscription_period) {
         case 'W':
         case 'week':
         case 'weeks':
@@ -530,14 +530,14 @@ 
         case 'M':
         case 'month':
         case 'months':
-            if ( $subscription_interval > 12 ) {
+            if ($subscription_interval > 12) {
                 $subscription_interval = 12;
             }
 
             $interval = $subscription_interval;
             $period   = 'months';
             
-            if ( !( $subscription_interval === 1 || $subscription_interval === 2 || $subscription_interval === 3 || $subscription_interval === 6 || $subscription_interval === 12 ) ) {
+            if (!($subscription_interval === 1 || $subscription_interval === 2 || $subscription_interval === 3 || $subscription_interval === 6 || $subscription_interval === 12)) {
                 $interval = $subscription_interval * 30;
                 $period   = 'days';
             }
@@ -554,30 +554,30 @@ 
             break;
     }
 
-    return compact( 'interval', 'period' );
+    return compact('interval', 'period');
 }
 
 function wpinv_authorizenet_process_ipn() {
-    if ( !( !empty( $_REQUEST['wpi-gateway'] ) && $_REQUEST['wpi-gateway'] == 'authorizenet' ) ) {
+    if (!(!empty($_REQUEST['wpi-gateway']) && $_REQUEST['wpi-gateway'] == 'authorizenet')) {
         return;
     }
 
-    $subscription_id = !empty( $_POST['x_subscription_id'] ) ? intval( $_POST['x_subscription_id'] ) : false;
+    $subscription_id = !empty($_POST['x_subscription_id']) ? intval($_POST['x_subscription_id']) : false;
 
-    if ( $subscription_id ) {
-        $response_code  = intval( $_POST['x_response_code'] );
-        $reason_code    = intval( $_POST['x_response_reason_code'] );
+    if ($subscription_id) {
+        $response_code  = intval($_POST['x_response_code']);
+        $reason_code    = intval($_POST['x_response_reason_code']);
 
-        $subscription = new WPInv_Subscription( $subscription_id, true );
+        $subscription = new WPInv_Subscription($subscription_id, true);
 
-        if ( !$subscription->id ) {
+        if (!$subscription->id) {
             return;
         }
 
-        if ( 1 == $response_code ) {
+        if (1 == $response_code) {
             // Approved
-            $transaction_id = sanitize_text_field( $_POST['x_trans_id'] );
-            $renewal_amount = sanitize_text_field( $_POST['x_amount'] );
+            $transaction_id = sanitize_text_field($_POST['x_trans_id']);
+            $renewal_amount = sanitize_text_field($_POST['x_amount']);
 
             $args = array(
                 'amount'         => $renewal_amount,
@@ -585,63 +585,63 @@ 
                 'gateway'        => 'authorizenet'
             );
 
-            $subscription->add_payment( $args );
+            $subscription->add_payment($args);
             $subscription->renew();
 
-            do_action( 'wpinv_recurring_authorizenet_silent_post_payment', $subscription );
-            do_action( 'wpinv_authorizenet_renewal_payment', $subscription );
-        } else if ( 2 == $response_code ) {
+            do_action('wpinv_recurring_authorizenet_silent_post_payment', $subscription);
+            do_action('wpinv_authorizenet_renewal_payment', $subscription);
+        } else if (2 == $response_code) {
             // Declined
             $subscription->failing();
-            do_action( 'wpinv_authorizenet_renewal_payment_failed', $subscription );
-            do_action( 'wpinv_authorizenet_renewal_error', $subscription );
-        } else if ( 3 == $response_code || 8 == $reason_code ) {
+            do_action('wpinv_authorizenet_renewal_payment_failed', $subscription);
+            do_action('wpinv_authorizenet_renewal_error', $subscription);
+        } else if (3 == $response_code || 8 == $reason_code) {
             // An expired card
             $subscription->failing();
-            do_action( 'wpinv_authorizenet_renewal_payment_failed', $subscription );
-            do_action( 'wpinv_authorizenet_renewal_error', $subscription );
+            do_action('wpinv_authorizenet_renewal_payment_failed', $subscription);
+            do_action('wpinv_authorizenet_renewal_error', $subscription);
         } else {
             // Other Error
-            do_action( 'wpinv_authorizenet_renewal_payment_error', $subscription );
+            do_action('wpinv_authorizenet_renewal_payment_error', $subscription);
         }
 
         exit;
     }
 }
-add_action( 'wpinv_verify_authorizenet_ipn', 'wpinv_authorizenet_process_ipn' );
+add_action('wpinv_verify_authorizenet_ipn', 'wpinv_authorizenet_process_ipn');
 
 /**
  * Retrieve the subscription
  */
-function wpinv_get_authorizenet_subscription( $subscription_data = array(), $invoice_id ) {
-    $parent_invoice_id = absint( $invoice_id );
+function wpinv_get_authorizenet_subscription($subscription_data = array(), $invoice_id) {
+    $parent_invoice_id = absint($invoice_id);
 
-    if ( empty( $subscription_data ) ) {
+    if (empty($subscription_data)) {
         return false;
     }
 
-    if ( empty( $parent_invoice_id ) ) {
+    if (empty($parent_invoice_id)) {
         return false;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
     $subscriptionId     = (array)$subscription_data->subscriptionId;
-    $subscription_id    = !empty( $subscriptionId[0] ) ? $subscriptionId[0] : $parent_invoice_id;
+    $subscription_id    = !empty($subscriptionId[0]) ? $subscriptionId[0] : $parent_invoice_id;
 
-    $subscription = new WPInv_Subscription( $subscription_id, true );
+    $subscription = new WPInv_Subscription($subscription_id, true);
 
-    if ( ! $subscription || $subscription->id < 1 ) {
+    if (!$subscription || $subscription->id < 1) {
         $subs_db      = new WPInv_Subscriptions_DB;
-        $subs         = $subs_db->get_subscriptions( array( 'parent_payment_id' => $parent_invoice_id, 'number' => 1 ) );
-        $subscription = reset( $subs );
+        $subs         = $subs_db->get_subscriptions(array('parent_payment_id' => $parent_invoice_id, 'number' => 1));
+        $subscription = reset($subs);
 
-        if ( $subscription && $subscription->id > 0 ) {
+        if ($subscription && $subscription->id > 0) {
             // Update the profile ID so it is set for future renewals
-            $subscription->update( array( 'profile_id' => sanitize_text_field( $subscription_id ) ) );
+            $subscription->update(array('profile_id' => sanitize_text_field($subscription_id)));
         } else {
             // No subscription found with a matching payment ID, bail
             return false;
@@ -652,67 +652,67 @@ 
 }
 
 function wpinv_is_authorizenet_valid_for_use() {
-    return in_array( wpinv_get_currency(), apply_filters( 'wpinv_authorizenet_supported_currencies', array( 'AUD', 'CAD', 'CHF', 'DKK', 'EUR', 'GBP', 'JPY', 'NOK', 'NZD', 'PLN', 'SEK', 'USD', 'ZAR' ) ) );
+    return in_array(wpinv_get_currency(), apply_filters('wpinv_authorizenet_supported_currencies', array('AUD', 'CAD', 'CHF', 'DKK', 'EUR', 'GBP', 'JPY', 'NOK', 'NZD', 'PLN', 'SEK', 'USD', 'ZAR')));
 }
-function wpinv_check_authorizenet_currency_support( $gateway_list ) {
-    if ( isset( $gateway_list['authorizenet'] ) && ! wpinv_is_authorizenet_valid_for_use() ) {
-        unset( $gateway_list['authorizenet'] );
+function wpinv_check_authorizenet_currency_support($gateway_list) {
+    if (isset($gateway_list['authorizenet']) && !wpinv_is_authorizenet_valid_for_use()) {
+        unset($gateway_list['authorizenet']);
     }
     return $gateway_list;
 }
-add_filter( 'wpinv_enabled_payment_gateways', 'wpinv_check_authorizenet_currency_support', 10, 1 );
+add_filter('wpinv_enabled_payment_gateways', 'wpinv_check_authorizenet_currency_support', 10, 1);
 
-function wpinv_authorizenet_link_transaction_id( $transaction_id, $invoice_id, $invoice ) {
-    if ( $transaction_id == $invoice_id ) {
+function wpinv_authorizenet_link_transaction_id($transaction_id, $invoice_id, $invoice) {
+    if ($transaction_id == $invoice_id) {
         $link = $transaction_id;
     } else {
-        if ( ! empty( $invoice ) && ! empty( $invoice->mode ) ) {
+        if (!empty($invoice) && !empty($invoice->mode)) {
             $mode = $invoice->mode;
         } else {
-            $mode = wpinv_is_test_mode( 'authorizenet' ) ? 'test' : 'live';
+            $mode = wpinv_is_test_mode('authorizenet') ? 'test' : 'live';
         }
 
         $url = $mode == 'test' ? 'https://sandbox.authorize.net/' : 'https://authorize.net/';
         $url .= 'ui/themes/sandbox/Transaction/TransactionReceipt.aspx?transid=' . $transaction_id;
 
-        $link = '<a href="' . esc_url( $url ) . '" target="_blank">' . $transaction_id . '</a>';
+        $link = '<a href="' . esc_url($url) . '" target="_blank">' . $transaction_id . '</a>';
     }
 
-    return apply_filters( 'wpinv_authorizenet_link_payment_details_transaction_id', $link, $transaction_id, $invoice );
+    return apply_filters('wpinv_authorizenet_link_payment_details_transaction_id', $link, $transaction_id, $invoice);
 }
-add_filter( 'wpinv_payment_details_transaction_id-authorizenet', 'wpinv_authorizenet_link_transaction_id', 10, 3 );
+add_filter('wpinv_payment_details_transaction_id-authorizenet', 'wpinv_authorizenet_link_transaction_id', 10, 3);
 
-function wpinv_authorizenet_transaction_id_link( $transaction_id, $subscription ) {
-    if ( ! empty( $transaction_id ) && ! empty( $subscription ) && ( $invoice_id = $subscription->get_original_payment_id() ) ) {
-        $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_authorizenet_transaction_id_link($transaction_id, $subscription) {
+    if (!empty($transaction_id) && !empty($subscription) && ($invoice_id = $subscription->get_original_payment_id())) {
+        $invoice = wpinv_get_invoice($invoice_id);
 
-        if ( ! empty( $invoice ) ) {
-            return wpinv_authorizenet_link_transaction_id( $transaction_id, $invoice_id, $invoice );
+        if (!empty($invoice)) {
+            return wpinv_authorizenet_link_transaction_id($transaction_id, $invoice_id, $invoice);
         }        
     }
     
     return $transaction_id;
 }
-add_filter( 'wpinv_subscription_transaction_link_authorizenet', 'wpinv_authorizenet_transaction_id_link', 10, 2 );
+add_filter('wpinv_subscription_transaction_link_authorizenet', 'wpinv_authorizenet_transaction_id_link', 10, 2);
 
-function wpinv_authorizenet_profile_id_link( $profile_id, $subscription ) {
+function wpinv_authorizenet_profile_id_link($profile_id, $subscription) {
     $link = $profile_id;
 
-    if ( ! empty( $profile_id ) && ! empty( $subscription ) && ( $invoice_id = $subscription->get_original_payment_id() ) ) {
-        $invoice = wpinv_get_invoice( $invoice_id );
+    if (!empty($profile_id) && !empty($subscription) && ($invoice_id = $subscription->get_original_payment_id())) {
+        $invoice = wpinv_get_invoice($invoice_id);
 
-        if ( ! empty( $invoice ) && ! empty( $invoice->mode ) ) {
+        if (!empty($invoice) && !empty($invoice->mode)) {
             $mode = $invoice->mode;
         } else {
-            $mode = wpinv_is_test_mode( 'authorizenet' ) ? 'test' : 'live';
+            $mode = wpinv_is_test_mode('authorizenet') ? 'test' : 'live';
         }
 
         $url = $mode == 'test' ? 'https://sandbox.authorize.net/' : 'https://authorize.net/';
         $url .= 'ui/themes/sandbox/ARB/SubscriptionDetail.aspx?SubscrID=' . $profile_id;
 
-        $link = '<a href="' . esc_url( $url ) . '" target="_blank">' . $profile_id . '</a>';
+        $link = '<a href="' . esc_url($url) . '" target="_blank">' . $profile_id . '</a>';
     }
     
-    return apply_filters( 'wpinv_authorizenet_profile_id_link', $link, $profile_id, $subscription );
+    return apply_filters('wpinv_authorizenet_profile_id_link', $link, $profile_id, $subscription);
 }
-add_filter( 'wpinv_subscription_profile_link_authorizenet', 'wpinv_authorizenet_profile_id_link', 10, 2 );
\ No newline at end of file
+add_filter('wpinv_subscription_profile_link_authorizenet', 'wpinv_authorizenet_profile_id_link', 10, 2);
\ No newline at end of file

includes/gateways/manual.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;
+}
 
 add_action( 'wpinv_manual_cc_form', '__return_false' );
 

Spacing +14 added lines, -14 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_manual_cc_form', '__return_false' );
+add_action('wpinv_manual_cc_form', '__return_false');
 
-function wpinv_process_manual_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_manual_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     /*
@@ -41,22 +41,22 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {        
-        wpinv_set_payment_transaction_id( $invoice->ID, $invoice->generate_key() );
-        wpinv_update_payment_status( $invoice, 'publish' );
+    if (!empty($invoice)) {        
+        wpinv_set_payment_transaction_id($invoice->ID, $invoice->generate_key());
+        wpinv_update_payment_status($invoice, 'publish');
         
         // Empty the shopping cart
         wpinv_empty_cart();
         
-        do_action( 'wpinv_send_to_success_page', $invoice->ID, $payment_data );
+        do_action('wpinv_send_to_success_page', $invoice->ID, $payment_data);
         
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // If errors are present, send the user back to the purchase page so they can be corrected
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_manual', 'wpinv_process_manual_payment' );
\ No newline at end of file
+add_action('wpinv_gateway_manual', 'wpinv_process_manual_payment');
\ No newline at end of file

includes/gateways/bank_transfer.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;
+}
 
 add_action( 'wpinv_bank_transfer_cc_form', '__return_false' );
 

Spacing +37 added lines, -37 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_bank_transfer_cc_form', '__return_false' );
+add_action('wpinv_bank_transfer_cc_form', '__return_false');
 
-function wpinv_process_bank_transfer_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_bank_transfer_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     // Collect payment data
@@ -24,39 +24,39 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {
-        wpinv_set_payment_transaction_id( $invoice->ID, $invoice->generate_key() );
-        wpinv_update_payment_status( $invoice, 'wpi-pending' );
+    if (!empty($invoice)) {
+        wpinv_set_payment_transaction_id($invoice->ID, $invoice->generate_key());
+        wpinv_update_payment_status($invoice, 'wpi-pending');
         
         // Empty the shopping cart
         wpinv_empty_cart();
         
-        do_action( 'wpinv_send_to_success_page', $invoice->ID, $payment_data );
+        do_action('wpinv_send_to_success_page', $invoice->ID, $payment_data);
         
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a bank transfer payment. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a bank transfer payment. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // If errors are present, send the user back to the purchase page so they can be corrected
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_bank_transfer', 'wpinv_process_bank_transfer_payment' );
+add_action('wpinv_gateway_bank_transfer', 'wpinv_process_bank_transfer_payment');
 
-function wpinv_show_bank_info( $invoice ) {
-    if ( !empty( $invoice ) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending' ) {
-        $bank_info = wpinv_get_bank_info( true );
+function wpinv_show_bank_info($invoice) {
+    if (!empty($invoice) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending') {
+        $bank_info = wpinv_get_bank_info(true);
         ?>
         <div class="wpinv-bank-details">
-            <?php if ( $instructions = wpinv_get_bank_instructions() ) { ?>
-            <div class="alert bg-info"><?php echo wpautop( wp_kses_post( $instructions ) ); ?></div>
+            <?php if ($instructions = wpinv_get_bank_instructions()) { ?>
+            <div class="alert bg-info"><?php echo wpautop(wp_kses_post($instructions)); ?></div>
             <?php } ?>
-            <?php if ( !empty( $bank_info ) ) { ?>
-            <h3 class="wpinv-bank-t"><?php echo apply_filters( 'wpinv_receipt_bank_details_title', __( 'Our Bank Details', 'invoicing' ) ); ?></h3>
+            <?php if (!empty($bank_info)) { ?>
+            <h3 class="wpinv-bank-t"><?php echo apply_filters('wpinv_receipt_bank_details_title', __('Our Bank Details', 'invoicing')); ?></h3>
             <table class="table table-bordered table-sm wpi-bank-details">
-                <?php foreach ( $bank_info as $key => $info ) { ?>
-                <tr class="wpi-<?php echo sanitize_html_class( $key );?>"><th class="text-left"><?php echo $info['label'] ;?></th><td><?php echo $info['value'] ;?></td></tr>
+                <?php foreach ($bank_info as $key => $info) { ?>
+                <tr class="wpi-<?php echo sanitize_html_class($key); ?>"><th class="text-left"><?php echo $info['label']; ?></th><td><?php echo $info['value']; ?></td></tr>
                 <?php } ?>
             </table>
             <?php } ?>
@@ -64,37 +64,37 @@ 
         <?php
     }
 }
-add_action( 'wpinv_before_receipt_details', 'wpinv_show_bank_info', 10, 1 );
+add_action('wpinv_before_receipt_details', 'wpinv_show_bank_info', 10, 1);
 
-function wpinv_invoice_print_bank_info( $invoice ) {
-    if ( !empty( $invoice ) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending' ) {
+function wpinv_invoice_print_bank_info($invoice) {
+    if (!empty($invoice) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending') {
         ?>
         <div class="row wpinv-bank-info">
-            <?php echo wpinv_show_bank_info( $invoice ); ?>
+            <?php echo wpinv_show_bank_info($invoice); ?>
         </div>
         <?php
     }
 }
-add_action( 'wpinv_invoice_print_after_top_content', 'wpinv_invoice_print_bank_info', 10, 1 );
+add_action('wpinv_invoice_print_after_top_content', 'wpinv_invoice_print_bank_info', 10, 1);
 
-function wpinv_bank_transfer_send_notification( $invoice_ID, $payment_data = array() ) {
-    if ( !empty( $payment_data['gateway'] ) && $payment_data['gateway'] == 'bank_transfer' ) {
+function wpinv_bank_transfer_send_notification($invoice_ID, $payment_data = array()) {
+    if (!empty($payment_data['gateway']) && $payment_data['gateway'] == 'bank_transfer') {
         // Send invoice to user.
-        wpinv_user_invoice_notification( $invoice_ID );
+        wpinv_user_invoice_notification($invoice_ID);
         
         // Send invoice to admin.
-        wpinv_new_invoice_notification( $invoice_ID );
+        wpinv_new_invoice_notification($invoice_ID);
     }
 }
-add_action( 'wpinv_send_to_success_page', 'wpinv_bank_transfer_send_notification', 10, 2 );
+add_action('wpinv_send_to_success_page', 'wpinv_bank_transfer_send_notification', 10, 2);
 
-function wpinv_invoice_email_bank_info( $invoice, $email_type = '', $sent_to_admin = false ) {
-    if ( !empty( $invoice ) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending' ) {
+function wpinv_invoice_email_bank_info($invoice, $email_type = '', $sent_to_admin = false) {
+    if (!empty($invoice) && $invoice->gateway == 'bank_transfer' && $invoice->status == 'wpi-pending') {
         ?>
         <div class="wpi-email-row">
-            <?php echo wpinv_show_bank_info( $invoice ); ?>
+            <?php echo wpinv_show_bank_info($invoice); ?>
         </div>
         <?php
     }
 }
-add_action( 'wpinv_email_invoice_details', 'wpinv_invoice_email_bank_info', 9, 3 );
\ No newline at end of file
+add_action('wpinv_email_invoice_details', 'wpinv_invoice_email_bank_info', 9, 3);
\ No newline at end of file

includes/gateways/paypal.php

Braces +6 added lines, -3 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 add_action( 'wpinv_paypal_cc_form', '__return_false' );
 add_filter( 'wpinv_paypal_support_subscription', '__return_true' );
@@ -307,8 +309,9 @@ 
 	}
 
 	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
+	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) ) {
+			return;
+	}
 
 	$defaults = array(
 		'txn_type'       => '',

Indentation +255 added lines, -255 removed lines

@@ -218,262 +218,262 @@ 
 add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
 
 function wpinv_process_paypal_ipn() {
-	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
-		return;
-	}
-
-	// Set initial post data to empty string
-	$post_data = '';
-
-	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
-	} else {
-		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
-	}
-	// Start the encoded data collection with notification command
-	$encoded_data = 'cmd=_notify-validate';
-
-	// Get current arg separator
-	$arg_separator = wpinv_get_php_arg_separator_output();
-
-	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
-		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
-	} else {
-		// Check if POST is empty
-		if ( empty( $_POST ) ) {
-			// Nothing to do
-			return;
-		} else {
-			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
-				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
-			}
-		}
-	}
-
-	// Convert collected post data to an array
-	parse_str( $encoded_data, $encoded_data_array );
-
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
-
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
-		}
-	}
-
-	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
-
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
-		// Validate the IPN
-
-		$remote_post_vars      = array(
-			'method'           => 'POST',
-			'timeout'          => 45,
-			'redirection'      => 5,
-			'httpversion'      => '1.1',
-			'blocking'         => true,
-			'headers'          => array(
-				'host'         => 'www.paypal.com',
-				'connection'   => 'close',
-				'content-type' => 'application/x-www-form-urlencoded',
-				'post'         => '/cgi-bin/webscr HTTP/1.1',
-
-			),
-			'sslverify'        => false,
-			'body'             => $encoded_data_array
-		);
-
-		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
-
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Something went wrong
-		}
-
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Response not okay
-		}
-	}
-
-	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
-
-	$defaults = array(
-		'txn_type'       => '',
-		'payment_status' => ''
-	);
-
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
-
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+    // Check the request method is POST
+    if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+        return;
+    }
+
+    // Set initial post data to empty string
+    $post_data = '';
+
+    // Fallback just in case post_max_size is lower than needed
+    if ( ini_get( 'allow_url_fopen' ) ) {
+        $post_data = file_get_contents( 'php://input' );
+    } else {
+        // If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
+        ini_set( 'post_max_size', '12M' );
+    }
+    // Start the encoded data collection with notification command
+    $encoded_data = 'cmd=_notify-validate';
+
+    // Get current arg separator
+    $arg_separator = wpinv_get_php_arg_separator_output();
+
+    // Verify there is a post_data
+    if ( $post_data || strlen( $post_data ) > 0 ) {
+        // Append the data
+        $encoded_data .= $arg_separator.$post_data;
+    } else {
+        // Check if POST is empty
+        if ( empty( $_POST ) ) {
+            // Nothing to do
+            return;
+        } else {
+            // Loop through each POST
+            foreach ( $_POST as $key => $value ) {
+                // Encode the value and append the data
+                $encoded_data .= $arg_separator."$key=" . urlencode( $value );
+            }
+        }
+    }
+
+    // Convert collected post data to an array
+    parse_str( $encoded_data, $encoded_data_array );
+
+    foreach ( $encoded_data_array as $key => $value ) {
+        if ( false !== strpos( $key, 'amp;' ) ) {
+            $new_key = str_replace( '&', '&', $key );
+            $new_key = str_replace( 'amp;', '&' , $new_key );
+
+            unset( $encoded_data_array[ $key ] );
+            $encoded_data_array[ $new_key ] = $value;
+        }
+    }
+
+    // Get the PayPal redirect uri
+    $paypal_redirect = wpinv_get_paypal_redirect( true );
+
+    if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+        // Validate the IPN
+
+        $remote_post_vars      = array(
+            'method'           => 'POST',
+            'timeout'          => 45,
+            'redirection'      => 5,
+            'httpversion'      => '1.1',
+            'blocking'         => true,
+            'headers'          => array(
+                'host'         => 'www.paypal.com',
+                'connection'   => 'close',
+                'content-type' => 'application/x-www-form-urlencoded',
+                'post'         => '/cgi-bin/webscr HTTP/1.1',
+
+            ),
+            'sslverify'        => false,
+            'body'             => $encoded_data_array
+        );
+
+        // Get response
+        $api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+
+        if ( is_wp_error( $api_response ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Something went wrong
+        }
+
+        if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Response not okay
+        }
+    }
+
+    // Check if $post_data_array has been populated
+    if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+        return;
+
+    $defaults = array(
+        'txn_type'       => '',
+        'payment_status' => ''
+    );
+
+    $encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+
+    $invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-	wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
-
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
-		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
-	} else {
-		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
-	}
-	exit;
+    wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
+    wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
+
+    if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+        // Allow PayPal IPN types to be processed separately
+        do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+    } else {
+        // Fallback to web accept just in case the txn_type isn't present
+        do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+    }
+    exit;
 }
 add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
 
 function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
-		return;
-	}
-
-	if( empty( $invoice_id ) ) {
-		return;
-	}
-
-	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
-	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
-
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
-		return; // this isn't a PayPal standard IPN
-	}
-
-	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
-		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
-		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
-
-		// Setup and store the customer's details
-		$user_info = array(
-			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
-			'discount'   => '',
-		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
-
-		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
-	}
-
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
-		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
-	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
-			return; // Only paid payments once
-		}
-
-		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
-
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
-			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
-			// Look for possible pending reasons, such as an echeck
-			$note = '';
-
-			switch( strtolower( $data['pending_reason'] ) ) {
-				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
-					break;
+    if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+        return;
+    }
+
+    if( empty( $invoice_id ) ) {
+        return;
+    }
+
+    // Collect payment details
+    $purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+    $paypal_amount  = $data['mc_gross'];
+    $payment_status = strtolower( $data['payment_status'] );
+    $currency_code  = strtolower( $data['mc_currency'] );
+    $business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
+    $payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+
+    if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+        return; // this isn't a PayPal standard IPN
+    }
+
+    // Verify payment recipient
+    if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    // Verify payment currency
+    if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+        // This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
+        // No email associated with purchase, so store from PayPal
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+
+        // Setup and store the customer's details
+        $user_info = array(
+            'user_id'    => '-1',
+            'email'      => sanitize_text_field( $data['payer_email'] ),
+            'first_name' => sanitize_text_field( $data['first_name'] ),
+            'last_name'  => sanitize_text_field( $data['last_name'] ),
+            'discount'   => '',
+        );
+        $user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
+        $user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
+        $user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
+        $user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
+        $user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+
+        $payment_meta['user_info'] = $user_info;
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+    }
+
+    if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+        // Process a refund
+        wpinv_process_paypal_refund( $data, $invoice_id );
+    } else {
+        if ( get_post_status( $invoice_id ) == 'publish' ) {
+            return; // Only paid payments once
+        }
+
+        // Retrieve the total purchase amount (before PayPal)
+        $payment_amount = wpinv_payment_total( $invoice_id );
+
+        if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+            // The prices don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+        if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+            // Purchase keys don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+
+        if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
+            wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
+            wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
+            wpinv_update_payment_status( $invoice_id, 'publish' );
+        } else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+            // Look for possible pending reasons, such as an echeck
+            $note = '';
+
+            switch( strtolower( $data['pending_reason'] ) ) {
+                case 'echeck' :
+                    $note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+                    break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+                    break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+                    break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
-					break;
+                    $note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+                    break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
-					break;
+                    $note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+                    break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
-					break;
-
-				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
-					break;
-			}
-
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
-			}
-		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
-		}
-	}
+                    $note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+                    break;
+
+                case 'other' :
+                    $note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+                    break;
+            }
+
+            if ( ! empty( $note ) ) {
+                wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
+            }
+        } else {
+            wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
+        }
+    }
 }
 add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
 
@@ -661,34 +661,34 @@ 
 }
 
 function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
-	// Collect payment details
+    // Collect payment details
 
-	if( empty( $invoice_id ) ) {
-		return;
-	}
+    if( empty( $invoice_id ) ) {
+        return;
+    }
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
-		return; // Only refund payments once
-	}
+    if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+        return; // Only refund payments once
+    }
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
-	$refund_amount  = $data['mc_gross'] * -1;
+    $payment_amount = wpinv_payment_total( $invoice_id );
+    $refund_amount  = $data['mc_gross'] * -1;
 
-	do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
+    do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
 
-		do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
+        do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
 
-		return; // This is a partial refund
-	}
+        return; // This is a partial refund
+    }
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
+    wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
 
-	do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
+    do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
 }
 
 function wpinv_get_paypal_redirect( $ssl_check = false ) {

Doc Comments +3 added lines

@@ -757,6 +757,9 @@
 }
 add_filter( 'wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1 );
 
+/**
+ * @param WPInv_Invoice $invoice
+ */
 function wpinv_paypal_link_transaction_id( $transaction_id, $invoice_id, $invoice ) {
     if ( $transaction_id == $invoice_id ) {
         $transaction_link = $transaction_id;

Spacing +283 added lines, -283 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_paypal_cc_form', '__return_false' );
-add_filter( 'wpinv_paypal_support_subscription', '__return_true' );
+add_action('wpinv_paypal_cc_form', '__return_false');
+add_filter('wpinv_paypal_support_subscription', '__return_true');
 
-function wpinv_process_paypal_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_paypal_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     // Collect payment data
@@ -25,30 +25,30 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
 
     // Check payment
-    if ( ! $invoice ) {
+    if (!$invoice) {
         // Record the error
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // Problems? send back
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     } else {
         // Only send to PayPal if the pending payment is created successfully
-        $listener_url = wpinv_get_ipn_url( 'paypal' );
+        $listener_url = wpinv_get_ipn_url('paypal');
 
         // Get the success url
-        $return_url = add_query_arg( array(
+        $return_url = add_query_arg(array(
                 'payment-confirm' => 'paypal',
                 'invoice-id' => $invoice->ID
-            ), get_permalink( wpinv_get_option( 'success_page', false ) ) );
+            ), get_permalink(wpinv_get_option('success_page', false)));
 
         // Get the PayPal redirect uri
-        $paypal_redirect = trailingslashit( wpinv_get_paypal_redirect() ) . '?';
+        $paypal_redirect = trailingslashit(wpinv_get_paypal_redirect()) . '?';
 
         // Setup PayPal arguments
         $paypal_args = array(
-            'business'      => wpinv_get_option( 'paypal_email', false ),
+            'business'      => wpinv_get_option('paypal_email', false),
             'email'         => $invoice->get_email(),
             'first_name'    => $invoice->get_first_name(),
             'last_name'     => $invoice->get_last_name(),
@@ -57,16 +57,16 @@ 
             'shipping'      => '0',
             'no_note'       => '1',
             'currency_code' => wpinv_get_currency(),
-            'charset'       => get_bloginfo( 'charset' ),
+            'charset'       => get_bloginfo('charset'),
             'custom'        => $invoice->ID,
             'rm'            => '2',
             'return'        => $return_url,
-            'cancel_return' => wpinv_get_failed_transaction_uri( '?invoice-id=' . $invoice->ID ),
+            'cancel_return' => wpinv_get_failed_transaction_uri('?invoice-id=' . $invoice->ID),
             'notify_url'    => $listener_url,
-            'cbt'           => get_bloginfo( 'name' ),
+            'cbt'           => get_bloginfo('name'),
             'bn'            => 'WPInvoicing_SP',
             'lc'            => 'US', // this will force paypal site to english
-            'landing_page'  => apply_filters( 'wpinv_paypal_standard_landing_page', 'billing', $invoice ), // 'login' or 'billing'. login - PayPal account login, billing - Non-PayPal account.
+            'landing_page'  => apply_filters('wpinv_paypal_standard_landing_page', 'billing', $invoice), // 'login' or 'billing'. login - PayPal account login, billing - Non-PayPal account.
         );
 
         $paypal_args['address1'] = $invoice->get_address();
@@ -80,57 +80,57 @@ 
             'upload' => '1'
         );
 
-        $paypal_args = array_merge( $paypal_extra_args, $paypal_args );
+        $paypal_args = array_merge($paypal_extra_args, $paypal_args);
 
         // Add cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {
                 $item['quantity'] = $item['quantity'] > 0 ? $item['quantity'] : 1;
-                $item_amount = wpinv_sanitize_amount( $item['subtotal'] / $item['quantity'], 2 );
+                $item_amount = wpinv_sanitize_amount($item['subtotal'] / $item['quantity'], 2);
 
-                if ( $item_amount <= 0 ) {
+                if ($item_amount <= 0) {
                     $item_amount = 0;
                 }
 
-                $paypal_args['item_number_' . $i ]      = $item['id'];
-                $paypal_args['item_name_' . $i ]        = stripslashes_deep( html_entity_decode( wpinv_get_cart_item_name( $item ), ENT_COMPAT, 'UTF-8' ) );
-                $paypal_args['quantity_' . $i ]         = $item['quantity'];
-                $paypal_args['amount_' . $i ]           = $item_amount;
-                $paypal_args['discount_amount_' . $i ]  = wpinv_sanitize_amount( $item['discount'], 2 );
+                $paypal_args['item_number_' . $i]      = $item['id'];
+                $paypal_args['item_name_' . $i]        = stripslashes_deep(html_entity_decode(wpinv_get_cart_item_name($item), ENT_COMPAT, 'UTF-8'));
+                $paypal_args['quantity_' . $i]         = $item['quantity'];
+                $paypal_args['amount_' . $i]           = $item_amount;
+                $paypal_args['discount_amount_' . $i]  = wpinv_sanitize_amount($item['discount'], 2);
 
                 $i++;
             }
         }
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() ) {
-            $paypal_args['tax_cart'] = wpinv_sanitize_amount( (float)$invoice->get_tax(), 2 );
+        if (wpinv_use_taxes()) {
+            $paypal_args['tax_cart'] = wpinv_sanitize_amount((float)$invoice->get_tax(), 2);
         }
 
-        $paypal_args = apply_filters( 'wpinv_paypal_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_args', $paypal_args, $purchase_data, $invoice);
 
         // Build query
-        $paypal_redirect .= http_build_query( $paypal_args );
+        $paypal_redirect .= http_build_query($paypal_args);
 
         // Fix for some sites that encode the entities
-        $paypal_redirect = str_replace( '&amp;', '&', $paypal_redirect );
+        $paypal_redirect = str_replace('&amp;', '&', $paypal_redirect);
 
         // Get rid of cart contents
         wpinv_empty_cart();
         
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
     }
 }
-add_action( 'wpinv_gateway_paypal', 'wpinv_process_paypal_payment' );
+add_action('wpinv_gateway_paypal', 'wpinv_process_paypal_payment');
 
-function wpinv_get_paypal_recurring_args( $paypal_args, $purchase_data, $invoice ) {
-    if ( $invoice->is_recurring() && $item_id = $invoice->get_recurring() ) {
-        $item   = new WPInv_Item( $item_id );
+function wpinv_get_paypal_recurring_args($paypal_args, $purchase_data, $invoice) {
+    if ($invoice->is_recurring() && $item_id = $invoice->get_recurring()) {
+        $item = new WPInv_Item($item_id);
         
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return $paypal_args;
         }
 
@@ -138,25 +138,25 @@ 
         $interval           = $item->get_recurring_interval();
         $bill_times         = (int)$item->get_recurring_limit();
         
-        $initial_amount     = wpinv_sanitize_amount( $invoice->get_total(), 2 );
-        $recurring_amount   = wpinv_sanitize_amount( $invoice->get_recurring_details( 'total' ), 2 );
+        $initial_amount     = wpinv_sanitize_amount($invoice->get_total(), 2);
+        $recurring_amount   = wpinv_sanitize_amount($invoice->get_recurring_details('total'), 2);
         
         $paypal_args['cmd'] = '_xclick-subscriptions';
         $paypal_args['sra'] = '1';
         $paypal_args['src'] = '1';
         
         // Set item description
-        $item_name                  = sprintf( '[%s] %s', $invoice->get_number(), wpinv_get_cart_item_name( array( 'id' => $item->ID ) ) );
-        $paypal_args['item_name']   = stripslashes_deep( html_entity_decode( $item_name, ENT_COMPAT, 'UTF-8' ) );
+        $item_name                  = sprintf('[%s] %s', $invoice->get_number(), wpinv_get_cart_item_name(array('id' => $item->ID)));
+        $paypal_args['item_name']   = stripslashes_deep(html_entity_decode($item_name, ENT_COMPAT, 'UTF-8'));
         
-        if ( $invoice->is_free_trial() && $item->has_free_trial() ) {
+        if ($invoice->is_free_trial() && $item->has_free_trial()) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $item->get_trial_interval();
             $paypal_args['t1']  = $item->get_trial_period();
             
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
-        } else if ( $initial_amount != $recurring_amount && $bill_times != 1 ) {
+        } else if ($initial_amount != $recurring_amount && $bill_times != 1) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $interval;
             $paypal_args['t1']  = $period;
@@ -164,63 +164,63 @@ 
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
             
-            if ( $bill_times > 1 ) {
+            if ($bill_times > 1) {
                 $bill_times--;
             }
         } else {
-            $paypal_args['a3']  = $initial_amount;
+            $paypal_args['a3'] = $initial_amount;
         }
         
         $paypal_args['p3']  = $interval;
         $paypal_args['t3']  = $period;
         
-        if ( $bill_times > 1 ) {
+        if ($bill_times > 1) {
             // Make sure it's not over the max of 52
-            $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+            $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
         }
                 
         // Remove cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {                
-                if ( isset( $paypal_args['item_number_' . $i] ) ) {
-                    unset( $paypal_args['item_number_' . $i] );
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {                
+                if (isset($paypal_args['item_number_' . $i])) {
+                    unset($paypal_args['item_number_' . $i]);
                 }
-                if ( isset( $paypal_args['item_name_' . $i] ) ) {
-                    unset( $paypal_args['item_name_' . $i] );
+                if (isset($paypal_args['item_name_' . $i])) {
+                    unset($paypal_args['item_name_' . $i]);
                 }
-                if ( isset( $paypal_args['quantity_' . $i] ) ) {
-                    unset( $paypal_args['quantity_' . $i] );
+                if (isset($paypal_args['quantity_' . $i])) {
+                    unset($paypal_args['quantity_' . $i]);
                 }
-                if ( isset( $paypal_args['amount_' . $i] ) ) {
-                    unset( $paypal_args['amount_' . $i] );
+                if (isset($paypal_args['amount_' . $i])) {
+                    unset($paypal_args['amount_' . $i]);
                 }
-                if ( isset( $paypal_args['discount_amount_' . $i] ) ) {
-                    unset( $paypal_args['discount_amount_' . $i] );
+                if (isset($paypal_args['discount_amount_' . $i])) {
+                    unset($paypal_args['discount_amount_' . $i]);
                 }
 
                 $i++;
             }
         }
         
-        if ( isset( $paypal_args['tax_cart'] ) ) {
-            unset( $paypal_args['tax_cart'] );
+        if (isset($paypal_args['tax_cart'])) {
+            unset($paypal_args['tax_cart']);
         }
                 
-        if ( isset( $paypal_args['upload'] ) ) {
-            unset( $paypal_args['upload'] );
+        if (isset($paypal_args['upload'])) {
+            unset($paypal_args['upload']);
         }
         
-        $paypal_args = apply_filters( 'wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice);
     }
     
     return $paypal_args;
 }
-add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
+add_filter('wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3);
 
 function wpinv_process_paypal_ipn() {
 	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+	if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'POST') {
 		return;
 	}
 
@@ -228,11 +228,11 @@ 
 	$post_data = '';
 
 	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
+	if (ini_get('allow_url_fopen')) {
+		$post_data = file_get_contents('php://input');
 	} else {
 		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
+		ini_set('post_max_size', '12M');
 	}
 	// Start the encoded data collection with notification command
 	$encoded_data = 'cmd=_notify-validate';
@@ -241,43 +241,43 @@ 
 	$arg_separator = wpinv_get_php_arg_separator_output();
 
 	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
+	if ($post_data || strlen($post_data) > 0) {
 		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
+		$encoded_data .= $arg_separator . $post_data;
 	} else {
 		// Check if POST is empty
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			// Nothing to do
 			return;
 		} else {
 			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
+			foreach ($_POST as $key => $value) {
 				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
+				$encoded_data .= $arg_separator . "$key=" . urlencode($value);
 			}
 		}
 	}
 
 	// Convert collected post data to an array
-	parse_str( $encoded_data, $encoded_data_array );
+	parse_str($encoded_data, $encoded_data_array);
 
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&amp;', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
+	foreach ($encoded_data_array as $key => $value) {
+		if (false !== strpos($key, 'amp;')) {
+			$new_key = str_replace('&amp;', '&', $key);
+			$new_key = str_replace('amp;', '&', $new_key);
 
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
+			unset($encoded_data_array[$key]);
+			$encoded_data_array[$new_key] = $value;
 		}
 	}
 
 	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
+	$paypal_redirect = wpinv_get_paypal_redirect(true);
 
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+	if (!wpinv_get_option('disable_paypal_verification', false)) {
 		// Validate the IPN
 
-		$remote_post_vars      = array(
+		$remote_post_vars = array(
 			'method'           => 'POST',
 			'timeout'          => 45,
 			'redirection'      => 5,
@@ -295,21 +295,21 @@ 
 		);
 
 		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+		$api_response = wp_remote_post(wpinv_get_paypal_redirect(), $remote_post_vars);
 
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if (is_wp_error($api_response)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Something went wrong
 		}
 
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if ($api_response['body'] !== 'VERIFIED' && wpinv_get_option('disable_paypal_verification', false)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Response not okay
 		}
 	}
 
 	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+	if (!is_array($encoded_data_array) && !empty($encoded_data_array))
 		return;
 
 	$defaults = array(
@@ -317,265 +317,265 @@ 
 		'payment_status' => ''
 	);
 
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+	$encoded_data_array = wp_parse_args($encoded_data_array, $defaults);
 
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+	$invoice_id = isset($encoded_data_array['custom']) ? absint($encoded_data_array['custom']) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-	wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
+	wpinv_error_log($encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__);
+	wpinv_error_log($encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__);
 
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+	if (has_action('wpinv_paypal_' . $encoded_data_array['txn_type'])) {
 		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id);
 	} else {
 		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_web_accept', $encoded_data_array, $invoice_id);
 	}
 	exit;
 }
-add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
+add_action('wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn');
 
-function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+function wpinv_process_paypal_web_accept_and_cart($data, $invoice_id) {
+	if ($data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded') {
 		return;
 	}
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
 	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+	$purchase_key   = isset($data['invoice']) ? $data['invoice'] : $data['item_number'];
 	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+	$payment_status = strtolower($data['payment_status']);
+	$currency_code  = strtolower($data['mc_currency']);
+	$business_email = isset($data['business']) && is_email($data['business']) ? trim($data['business']) : trim($data['receiver_email']);
+	$payment_meta   = wpinv_get_invoice_meta($invoice_id);
 
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+	if (wpinv_get_payment_gateway($invoice_id) != 'paypal') {
 		return; // this isn't a PayPal standard IPN
 	}
 
 	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
+	if (strcasecmp($business_email, trim(wpinv_get_option('paypal_email', false))) != 0) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid business email in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid PayPal business email.', 'invoicing'), '', '', true);
 		return;
 	}
 
 	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
+	if ($currency_code != strtolower($payment_meta['currency'])) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid currency in PayPal IPN.', 'invoicing'), '', '', true);
 		return;
 	}
 
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+	if (!wpinv_get_payment_user_email($invoice_id)) {
 		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
 		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_email', $data['payer_email']);
 
 		// Setup and store the customer's details
 		$user_info = array(
 			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
+			'email'      => sanitize_text_field($data['payer_email']),
+			'first_name' => sanitize_text_field($data['first_name']),
+			'last_name'  => sanitize_text_field($data['last_name']),
 			'discount'   => '',
 		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+		$user_info['address'] = !empty($data['address_street']) ? sanitize_text_field($data['address_street']) : false;
+		$user_info['city']    = !empty($data['address_city']) ? sanitize_text_field($data['address_city']) : false;
+		$user_info['state']   = !empty($data['address_state']) ? sanitize_text_field($data['address_state']) : false;
+		$user_info['country'] = !empty($data['address_country_code']) ? sanitize_text_field($data['address_country_code']) : false;
+		$user_info['zip']     = !empty($data['address_zip']) ? sanitize_text_field($data['address_zip']) : false;
 
 		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_payment_meta', $payment_meta);
 	}
 
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+	if ($payment_status == 'refunded' || $payment_status == 'reversed') {
 		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
+		wpinv_process_paypal_refund($data, $invoice_id);
 	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
+		if (get_post_status($invoice_id) == 'publish') {
 			return; // Only paid payments once
 		}
 
 		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
+		$payment_amount = wpinv_payment_total($invoice_id);
 
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+		if (number_format((float)$paypal_amount, 2) < number_format((float)$payment_amount, 2)) {
 			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid payment amount in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid amount in PayPal IPN.', 'invoicing'), '', '', true);
 			return;
 		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+		if ($purchase_key != wpinv_get_payment_key($invoice_id)) {
 			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid purchase key in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing'), '', '', true);
 			return;
 		}
 
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+		if ('complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode('paypal')) {
+			wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $data['txn_id']), '', '', true);
+			wpinv_set_payment_transaction_id($invoice_id, $data['txn_id']);
+			wpinv_update_payment_status($invoice_id, 'publish');
+		} else if ('pending' == $payment_status && isset($data['pending_reason'])) {
 			// Look for possible pending reasons, such as an echeck
 			$note = '';
 
-			switch( strtolower( $data['pending_reason'] ) ) {
+			switch (strtolower($data['pending_reason'])) {
 				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+					$note = __('Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing');
 					break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+					$note = __('Payment must be accepted manually through PayPal due to international account regulations', 'invoicing');
 					break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+					$note = __('Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing');
 					break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+					$note = __('Payment was sent to non-confirmed or non-registered email address.', 'invoicing');
 					break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+					$note = __('PayPal account must be upgraded before this payment can be accepted', 'invoicing');
 					break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+					$note = __('PayPal account is not verified. Verify account in order to accept this payment', 'invoicing');
 					break;
 
 				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+					$note = __('Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing');
 					break;
 			}
 
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
+			if (!empty($note)) {
+				wpinv_insert_payment_note($invoice_id, $note, '', '', true);
 			}
 		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
+			wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal IPN has been received with invalid payment status: %s', 'invoicing'), $payment_status), '', '', true);
 		}
 	}
 }
-add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
+add_action('wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2);
 
 // Process PayPal subscription sign ups
-add_action( 'wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup' );
+add_action('wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup');
 
 // Process PayPal subscription payments
-add_action( 'wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment' );
+add_action('wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment');
 
 // Process PayPal subscription cancellations
-add_action( 'wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel' );
+add_action('wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel');
 
 // Process PayPal subscription end of term notices
-add_action( 'wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot' );
+add_action('wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot');
 
 // Process PayPal payment failed
-add_action( 'wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed' );
+add_action('wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed');
 
 
 /**
  * Process the subscription started IPN.
  */
-function wpinv_process_paypal_subscr_signup( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
-    if( empty( $parent_invoice_id ) ) {
+function wpinv_process_paypal_subscr_signup($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
+    if (empty($parent_invoice_id)) {
         return;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return;
     }
 
-    if ( $invoice->is_free_trial() && !empty( $ipn_data['invoice'] ) ) {
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Invoice ID: %s', 'invoicing' ) , $ipn_data['invoice'] ), '', '', true);
-        if ( !empty( $ipn_data['txn_id'] ) ) {
-            wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['txn_id'] );
+    if ($invoice->is_free_trial() && !empty($ipn_data['invoice'])) {
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Invoice ID: %s', 'invoicing'), $ipn_data['invoice']), '', '', true);
+        if (!empty($ipn_data['txn_id'])) {
+            wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['txn_id']);
         }
     }
 
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
     
-    wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    wpinv_update_payment_status($parent_invoice_id, 'publish');
     sleep(1);
-    wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $ipn_data['subscr_id'] ), '', '', true );
-    update_post_meta($parent_invoice_id,'_wpinv_subscr_profile_id', $ipn_data['subscr_id']);
+    wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $ipn_data['subscr_id']), '', '', true);
+    update_post_meta($parent_invoice_id, '_wpinv_subscr_profile_id', $ipn_data['subscr_id']);
 
     $status     = 'trialling' == $subscription->status ? 'trialling' : 'active';
-    $diff_days  = absint( ( ( strtotime( $subscription->expiration ) - strtotime( $subscription->created ) ) / DAY_IN_SECONDS ) );
-    $created    = date_i18n( 'Y-m-d H:i:s' );
-    $expiration = date_i18n( 'Y-m-d 23:59:59', ( strtotime( $created ) + ( $diff_days * DAY_IN_SECONDS ) ) );
+    $diff_days  = absint(((strtotime($subscription->expiration) - strtotime($subscription->created)) / DAY_IN_SECONDS));
+    $created    = date_i18n('Y-m-d H:i:s');
+    $expiration = date_i18n('Y-m-d 23:59:59', (strtotime($created) + ($diff_days * DAY_IN_SECONDS)));
 
     // Retrieve pending subscription from database and update it's status to active and set proper profile ID
-    $subscription->update( array( 'profile_id' => $ipn_data['subscr_id'], 'status' => $status, 'created' => $created, 'expiration' => $expiration ) );
+    $subscription->update(array('profile_id' => $ipn_data['subscr_id'], 'status' => $status, 'created' => $created, 'expiration' => $expiration));
 }
 
 /**
  * Process the subscription payment received IPN.
  */
-function wpinv_process_paypal_subscr_payment( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_process_paypal_subscr_payment($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
 
-    $parent_invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $parent_invoice ) ) {
+    $parent_invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($parent_invoice)) {
         return;
     }
 
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
 
-    $transaction_id = wpinv_get_payment_transaction_id( $parent_invoice_id );
+    $transaction_id = wpinv_get_payment_transaction_id($parent_invoice_id);
     $times_billed   = $subscription->get_times_billed();
-    $signup_date    = strtotime( $subscription->created );
-    $today          = date( 'Ynd', $signup_date ) == date( 'Ynd', strtotime( $ipn_data['payment_date'] ) );
+    $signup_date    = strtotime($subscription->created);
+    $today          = date('Ynd', $signup_date) == date('Ynd', strtotime($ipn_data['payment_date']));
 
     // Look to see if payment is same day as signup and we have set the transaction ID on the parent payment yet.
-    if ( (empty($times_billed) || $today) && ( !$transaction_id || $transaction_id == $parent_invoice_id ) ) {
-        wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    if ((empty($times_billed) || $today) && (!$transaction_id || $transaction_id == $parent_invoice_id)) {
+        wpinv_update_payment_status($parent_invoice_id, 'publish');
         sleep(1);
         
         // This is the very first payment
-        wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['txn_id'] );
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ), '', '', true );
+        wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['txn_id']);
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']), '', '', true);
         return;
     }
 
-    if ( wpinv_get_id_by_transaction_id( $ipn_data['txn_id'] ) ) {
+    if (wpinv_get_id_by_transaction_id($ipn_data['txn_id'])) {
         return; // Payment already recorded
     }
 
-    $currency_code = strtolower( $ipn_data['mc_currency'] );
+    $currency_code = strtolower($ipn_data['mc_currency']);
 
     // verify details
-    if ( $currency_code != strtolower( wpinv_get_currency() ) ) {
+    if ($currency_code != strtolower(wpinv_get_currency())) {
         // the currency code is invalid
-        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: ', 'invoicing' ), json_encode( $ipn_data ) ) );
+        wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: ', 'invoicing'), json_encode($ipn_data)));
         return;
     }
 
@@ -585,11 +585,11 @@ 
         'gateway'        => 'paypal'
     );
     
-    $invoice_id = $subscription->add_payment( $args );
+    $invoice_id = $subscription->add_payment($args);
 
-    if ( $invoice_id > 0 ) {
-        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ), '', '', true );
-        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $ipn_data['subscr_id'] ), '', '', true );
+    if ($invoice_id > 0) {
+        wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']), '', '', true);
+        wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $ipn_data['subscr_id']), '', '', true);
 
         $subscription->renew();
     }
@@ -598,10 +598,10 @@ 
 /**
  * Process the subscription canceled IPN.
  */
-function wpinv_process_paypal_subscr_cancel( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_cancel($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -611,10 +611,10 @@ 
 /**
  * Process the subscription expired IPN.
  */
-function wpinv_process_paypal_subscr_eot( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_eot($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -624,40 +624,40 @@ 
 /**
  * Process the subscription payment failed IPN.
  */
-function wpinv_process_paypal_subscr_failed( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_failed($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
     $subscription->failing();
 
-    do_action( 'wpinv_recurring_payment_failed', $subscription );
+    do_action('wpinv_recurring_payment_failed', $subscription);
 }
 
 /**
  * Retrieve the subscription this IPN notice is for.
  */
-function wpinv_get_paypal_subscription( $ipn_data = array() ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_get_paypal_subscription($ipn_data = array()) {
+    $parent_invoice_id = absint($ipn_data['custom']);
 
-    if( empty( $parent_invoice_id ) ) {
+    if (empty($parent_invoice_id)) {
         return false;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    $subscription = new WPInv_Subscription( $ipn_data['subscr_id'], true );
+    $subscription = new WPInv_Subscription($ipn_data['subscr_id'], true);
 
-    if ( ! ( ! empty( $subscription ) && $subscription->id > 0 ) ) {
-        $subscription = wpinv_get_subscription( $parent_invoice_id );
+    if (!(!empty($subscription) && $subscription->id > 0)) {
+        $subscription = wpinv_get_subscription($parent_invoice_id);
 
-        if ( ! empty( $subscription ) && $subscription->id > 0 ) {
-            $subscription->update( array( 'profile_id' => sanitize_text_field( $ipn_data['subscr_id'] ) ) );
+        if (!empty($subscription) && $subscription->id > 0) {
+            $subscription->update(array('profile_id' => sanitize_text_field($ipn_data['subscr_id'])));
         } else {
             return false;
         }
@@ -667,46 +667,46 @@ 
 
 }
 
-function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
+function wpinv_process_paypal_refund($data, $invoice_id = 0) {
 	// Collect payment details
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+	if (get_post_status($invoice_id) == 'wpi-refunded') {
 		return; // Only refund payments once
 	}
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
+	$payment_amount = wpinv_payment_total($invoice_id);
 	$refund_amount  = $data['mc_gross'] * -1;
 
-	do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
+	do_action('wpinv_paypal_refund_request', $data, $invoice_id);
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+	if (number_format((float)$refund_amount, 2) < number_format((float)$payment_amount, 2)) {
+		wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing'), (float)$refund_amount . ' ' . $data['mc_currency'], $data['parent_txn_id'], $data['reason_code']), '', '', true);
 
-		do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
+		do_action('wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount);
 
 		return; // This is a partial refund
 	}
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Payment #%s Refunded for reason: %s', 'invoicing'), $data['parent_txn_id'], $data['reason_code']), '', '', true);
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Refund Transaction ID: %s', 'invoicing'), $data['txn_id']), '', '', true);
+	wpinv_update_payment_status($invoice_id, 'wpi-refunded');
 
-	do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
+	do_action('wpinv_paypal_invoice_fully_refunded', $data, $invoice_id);
 }
 
-function wpinv_get_paypal_redirect( $ssl_check = false ) {
-    if ( is_ssl() || ! $ssl_check ) {
+function wpinv_get_paypal_redirect($ssl_check = false) {
+    if (is_ssl() || !$ssl_check) {
         $protocol = 'https://';
     } else {
         $protocol = 'http://';
     }
 
     // Check the current payment mode
-    if ( wpinv_is_test_mode( 'paypal' ) ) {
+    if (wpinv_is_test_mode('paypal')) {
         // Test mode
         $paypal_uri = $protocol . 'www.sandbox.paypal.com/cgi-bin/webscr';
     } else {
@@ -714,120 +714,120 @@ 
         $paypal_uri = $protocol . 'www.paypal.com/cgi-bin/webscr';
     }
 
-    return apply_filters( 'wpinv_paypal_uri', $paypal_uri );
+    return apply_filters('wpinv_paypal_uri', $paypal_uri);
 }
 
-function wpinv_paypal_success_page_content( $content ) {
+function wpinv_paypal_success_page_content($content) {
     global $wpi_invoice;
     
     $session = wpinv_get_checkout_session();
 
-    if ( empty( $_GET['invoice-id'] ) && empty( $session['invoice_key'] )  ) {
+    if (empty($_GET['invoice-id']) && empty($session['invoice_key'])) {
         return $content;
     }
 
-    $invoice_id = !empty( $_GET['invoice-id'] ) ? absint( $_GET['invoice-id'] ) : wpinv_get_invoice_id_by_key( $session['invoice_key'] );
+    $invoice_id = !empty($_GET['invoice-id']) ? absint($_GET['invoice-id']) : wpinv_get_invoice_id_by_key($session['invoice_key']);
 
-    if ( empty(  $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return $content;
     }
 
-    $wpi_invoice = wpinv_get_invoice( $invoice_id );
+    $wpi_invoice = wpinv_get_invoice($invoice_id);
     
-    if ( !empty( $wpi_invoice ) && 'wpi-pending' == $wpi_invoice->status ) {
+    if (!empty($wpi_invoice) && 'wpi-pending' == $wpi_invoice->status) {
         // Payment is still pending so show processing indicator to fix the Race Condition, issue #
         ob_start();
-        wpinv_get_template_part( 'wpinv-payment-processing' );
+        wpinv_get_template_part('wpinv-payment-processing');
         $content = ob_get_clean();
     }
 
     return $content;
 }
-add_filter( 'wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content' );
+add_filter('wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content');
 
-function wpinv_paypal_get_transaction_id( $invoice_id ) {
+function wpinv_paypal_get_transaction_id($invoice_id) {
     $transaction_id = '';
-    $notes = wpinv_get_invoice_notes( $invoice_id );
+    $notes = wpinv_get_invoice_notes($invoice_id);
 
-    foreach ( $notes as $note ) {
-        if ( preg_match( '/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match ) ) {
+    foreach ($notes as $note) {
+        if (preg_match('/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match)) {
             $transaction_id = $match[1];
             continue;
         }
     }
 
-    return apply_filters( 'wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id );
+    return apply_filters('wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id);
 }
-add_filter( 'wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1 );
+add_filter('wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1);
 
-function wpinv_paypal_link_transaction_id( $transaction_id, $invoice_id, $invoice ) {
-    if ( $transaction_id == $invoice_id ) {
+function wpinv_paypal_link_transaction_id($transaction_id, $invoice_id, $invoice) {
+    if ($transaction_id == $invoice_id) {
         $transaction_link = $transaction_id;
     } else {
-        if ( ! empty( $invoice ) && ! empty( $invoice->mode ) ) {
+        if (!empty($invoice) && !empty($invoice->mode)) {
             $mode = $invoice->mode;
         } else {
-            $mode = wpinv_is_test_mode( 'paypal' ) ? 'test' : 'live';
+            $mode = wpinv_is_test_mode('paypal') ? 'test' : 'live';
         }
 
         $sandbox = $mode == 'test' ? '.sandbox' : '';
         $transaction_url = 'https://www' . $sandbox . '.paypal.com/webscr?cmd=_history-details-from-hub&id=' . $transaction_id;
 
-        $transaction_link = '<a href="' . esc_url( $transaction_url ) . '" target="_blank">' . $transaction_id . '</a>';
+        $transaction_link = '<a href="' . esc_url($transaction_url) . '" target="_blank">' . $transaction_id . '</a>';
     }
 
-    return apply_filters( 'wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $transaction_id, $invoice );
+    return apply_filters('wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $transaction_id, $invoice);
 }
-add_filter( 'wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3 );
+add_filter('wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3);
 
-function wpinv_paypal_profile_id_link( $profile_id, $subscription ) {
+function wpinv_paypal_profile_id_link($profile_id, $subscription) {
     $link = $profile_id;
 
-    if ( ! empty( $profile_id ) && ! empty( $subscription ) && ( $invoice_id = $subscription->get_original_payment_id() ) ) {
-        $invoice = wpinv_get_invoice( $invoice_id );
+    if (!empty($profile_id) && !empty($subscription) && ($invoice_id = $subscription->get_original_payment_id())) {
+        $invoice = wpinv_get_invoice($invoice_id);
 
-        if ( ! empty( $invoice ) && ! empty( $invoice->mode ) ) {
+        if (!empty($invoice) && !empty($invoice->mode)) {
             $mode = $invoice->mode;
         } else {
-            $mode = wpinv_is_test_mode( 'paypal' ) ? 'test' : 'live';
+            $mode = wpinv_is_test_mode('paypal') ? 'test' : 'live';
         }
 
         $sandbox = $mode == 'test' ? '.sandbox' : '';
         $url = 'https://www' . $sandbox . '.paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=' . $profile_id;
 
-        $link = '<a href="' . esc_url( $url ) . '" target="_blank">' . $profile_id . '</a>';
+        $link = '<a href="' . esc_url($url) . '" target="_blank">' . $profile_id . '</a>';
     }
     
-    return apply_filters( 'wpinv_paypal_profile_id_link', $link, $profile_id, $subscription );
+    return apply_filters('wpinv_paypal_profile_id_link', $link, $profile_id, $subscription);
 }
-add_filter( 'wpinv_subscription_profile_link_paypal', 'wpinv_paypal_profile_id_link', 10, 2 );
+add_filter('wpinv_subscription_profile_link_paypal', 'wpinv_paypal_profile_id_link', 10, 2);
 
-function wpinv_paypal_transaction_id_link( $transaction_id, $subscription ) {
-    if ( ! empty( $transaction_id ) && ! empty( $subscription ) && ( $invoice_id = $subscription->get_original_payment_id() ) ) {
-        $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_paypal_transaction_id_link($transaction_id, $subscription) {
+    if (!empty($transaction_id) && !empty($subscription) && ($invoice_id = $subscription->get_original_payment_id())) {
+        $invoice = wpinv_get_invoice($invoice_id);
 
-        if ( ! empty( $invoice ) ) {
-            return wpinv_paypal_link_transaction_id( $transaction_id, $invoice_id, $invoice );
+        if (!empty($invoice)) {
+            return wpinv_paypal_link_transaction_id($transaction_id, $invoice_id, $invoice);
         }        
     }
     
     return $transaction_id;
 }
-add_filter( 'wpinv_subscription_transaction_link_paypal', 'wpinv_paypal_transaction_id_link', 10, 2 );
+add_filter('wpinv_subscription_transaction_link_paypal', 'wpinv_paypal_transaction_id_link', 10, 2);
 
 function wpinv_is_paypal_valid_for_use() {
-    return in_array( wpinv_get_currency(), apply_filters( 'wpinv_paypal_supported_currencies', array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' ) ) );
+    return in_array(wpinv_get_currency(), apply_filters('wpinv_paypal_supported_currencies', array('AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR')));
 }
 
-function wpinv_check_paypal_currency_support( $gateway_list ) {
-    if ( isset( $gateway_list['paypal'] ) && ! wpinv_is_paypal_valid_for_use() ) {
-        unset( $gateway_list['paypal'] );
+function wpinv_check_paypal_currency_support($gateway_list) {
+    if (isset($gateway_list['paypal']) && !wpinv_is_paypal_valid_for_use()) {
+        unset($gateway_list['paypal']);
     }
     return $gateway_list;
 }
-add_filter( 'wpinv_enabled_payment_gateways', 'wpinv_check_paypal_currency_support', 10, 1 );
+add_filter('wpinv_enabled_payment_gateways', 'wpinv_check_paypal_currency_support', 10, 1);
 
-function wpinv_gateway_paypal_button_label( $label ) {
-    return __( 'Proceed to PayPal', 'invoicing' );
+function wpinv_gateway_paypal_button_label($label) {
+    return __('Proceed to PayPal', 'invoicing');
 }
-add_filter( 'wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1 );
\ No newline at end of file
+add_filter('wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1);
\ No newline at end of file

includes/wpinv-address-functions.php

Braces +12 added lines, -8 removed lines

@@ -95,20 +95,24 @@
     }
 
     if ( !empty( $user_info ) ) {
-        if( empty( $address['first_name'] ) )
-            $address['first_name'] = $user_info->first_name;
+        if( empty( $address['first_name'] ) ) {
+                    $address['first_name'] = $user_info->first_name;
+        }
         
-        if( empty( $address['last_name'] ) )
-            $address['last_name'] = $user_info->last_name;
+        if( empty( $address['last_name'] ) ) {
+                    $address['last_name'] = $user_info->last_name;
+        }
     }
     
     $address['name'] = trim( trim( $address['first_name'] . ' ' . $address['last_name'] ), "," );
     
-    if( empty( $address['state'] ) && $with_default )
-        $address['state'] = wpinv_get_default_state();
+    if( empty( $address['state'] ) && $with_default ) {
+            $address['state'] = wpinv_get_default_state();
+    }
 
-    if( empty( $address['country'] ) && $with_default )
-        $address['country'] = wpinv_get_default_country();
+    if( empty( $address['country'] ) && $with_default ) {
+            $address['country'] = wpinv_get_default_country();
+    }
 
 
     return $address;

Indentation +278 added lines, -278 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 function wpinv_is_base_country( $country ) {
@@ -40,9 +40,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', false );
+    $state = wpinv_get_option( 'default_state', false );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -115,260 +115,260 @@ 
 }
 
 function wpinv_get_country_list( $first_empty = false ) {
-	$countries = array(
-		'US' => __('United States', 'invoicing'),
-		'CA' => __('Canada', 'invoicing'),
-		'GB' => __('United Kingdom', 'invoicing'),
-		'AF' => __('Afghanistan', 'invoicing'),
-		'AX' => __('Aland Islands', 'invoicing'),
-		'AL' => __('Albania', 'invoicing'),
-		'DZ' => __('Algeria', 'invoicing'),
-		'AS' => __('American Samoa', 'invoicing'),
-		'AD' => __('Andorra', 'invoicing'),
-		'AO' => __('Angola', 'invoicing'),
-		'AI' => __('Anguilla', 'invoicing'),
-		'AQ' => __('Antarctica', 'invoicing'),
-		'AG' => __('Antigua and Barbuda', 'invoicing'),
-		'AR' => __('Argentina', 'invoicing'),
-		'AM' => __('Armenia', 'invoicing'),
-		'AW' => __('Aruba', 'invoicing'),
-		'AU' => __('Australia', 'invoicing'),
-		'AT' => __('Austria', 'invoicing'),
-		'AZ' => __('Azerbaijan', 'invoicing'),
-		'BS' => __('Bahamas', 'invoicing'),
-		'BH' => __('Bahrain', 'invoicing'),
-		'BD' => __('Bangladesh', 'invoicing'),
-		'BB' => __('Barbados', 'invoicing'),
-		'BY' => __('Belarus', 'invoicing'),
-		'BE' => __('Belgium', 'invoicing'),
-		'BZ' => __('Belize', 'invoicing'),
-		'BJ' => __('Benin', 'invoicing'),
-		'BM' => __('Bermuda', 'invoicing'),
-		'BT' => __('Bhutan', 'invoicing'),
-		'BO' => __('Bolivia', 'invoicing'),
-		'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
-		'BA' => __('Bosnia and Herzegovina', 'invoicing'),
-		'BW' => __('Botswana', 'invoicing'),
-		'BV' => __('Bouvet Island', 'invoicing'),
-		'BR' => __('Brazil', 'invoicing'),
-		'IO' => __('British Indian Ocean Territory', 'invoicing'),
-		'BN' => __('Brunei Darrussalam', 'invoicing'),
-		'BG' => __('Bulgaria', 'invoicing'),
-		'BF' => __('Burkina Faso', 'invoicing'),
-		'BI' => __('Burundi', 'invoicing'),
-		'KH' => __('Cambodia', 'invoicing'),
-		'CM' => __('Cameroon', 'invoicing'),
-		'CV' => __('Cape Verde', 'invoicing'),
-		'KY' => __('Cayman Islands', 'invoicing'),
-		'CF' => __('Central African Republic', 'invoicing'),
-		'TD' => __('Chad', 'invoicing'),
-		'CL' => __('Chile', 'invoicing'),
-		'CN' => __('China', 'invoicing'),
-		'CX' => __('Christmas Island', 'invoicing'),
-		'CC' => __('Cocos Islands', 'invoicing'),
-		'CO' => __('Colombia', 'invoicing'),
-		'KM' => __('Comoros', 'invoicing'),
-		'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
-		'CG' => __('Congo, Republic of', 'invoicing'),
-		'CK' => __('Cook Islands', 'invoicing'),
-		'CR' => __('Costa Rica', 'invoicing'),
-		'CI' => __('Cote d\'Ivoire', 'invoicing'),
-		'HR' => __('Croatia/Hrvatska', 'invoicing'),
-		'CU' => __('Cuba', 'invoicing'),
-		'CW' => __('CuraÇao', 'invoicing'),
-		'CY' => __('Cyprus', 'invoicing'),
-		'CZ' => __('Czech Republic', 'invoicing'),
-		'DK' => __('Denmark', 'invoicing'),
-		'DJ' => __('Djibouti', 'invoicing'),
-		'DM' => __('Dominica', 'invoicing'),
-		'DO' => __('Dominican Republic', 'invoicing'),
-		'TP' => __('East Timor', 'invoicing'),
-		'EC' => __('Ecuador', 'invoicing'),
-		'EG' => __('Egypt', 'invoicing'),
-		'GQ' => __('Equatorial Guinea', 'invoicing'),
-		'SV' => __('El Salvador', 'invoicing'),
-		'ER' => __('Eritrea', 'invoicing'),
-		'EE' => __('Estonia', 'invoicing'),
-		'ET' => __('Ethiopia', 'invoicing'),
-		'FK' => __('Falkland Islands', 'invoicing'),
-		'FO' => __('Faroe Islands', 'invoicing'),
-		'FJ' => __('Fiji', 'invoicing'),
-		'FI' => __('Finland', 'invoicing'),
-		'FR' => __('France', 'invoicing'),
-		'GF' => __('French Guiana', 'invoicing'),
-		'PF' => __('French Polynesia', 'invoicing'),
-		'TF' => __('French Southern Territories', 'invoicing'),
-		'GA' => __('Gabon', 'invoicing'),
-		'GM' => __('Gambia', 'invoicing'),
-		'GE' => __('Georgia', 'invoicing'),
-		'DE' => __('Germany', 'invoicing'),
-		'GR' => __('Greece', 'invoicing'),
-		'GH' => __('Ghana', 'invoicing'),
-		'GI' => __('Gibraltar', 'invoicing'),
-		'GL' => __('Greenland', 'invoicing'),
-		'GD' => __('Grenada', 'invoicing'),
-		'GP' => __('Guadeloupe', 'invoicing'),
-		'GU' => __('Guam', 'invoicing'),
-		'GT' => __('Guatemala', 'invoicing'),
-		'GG' => __('Guernsey', 'invoicing'),
-		'GN' => __('Guinea', 'invoicing'),
-		'GW' => __('Guinea-Bissau', 'invoicing'),
-		'GY' => __('Guyana', 'invoicing'),
-		'HT' => __('Haiti', 'invoicing'),
-		'HM' => __('Heard and McDonald Islands', 'invoicing'),
-		'VA' => __('Holy See (City Vatican State)', 'invoicing'),
-		'HN' => __('Honduras', 'invoicing'),
-		'HK' => __('Hong Kong', 'invoicing'),
-		'HU' => __('Hungary', 'invoicing'),
-		'IS' => __('Iceland', 'invoicing'),
-		'IN' => __('India', 'invoicing'),
-		'ID' => __('Indonesia', 'invoicing'),
-		'IR' => __('Iran', 'invoicing'),
-		'IQ' => __('Iraq', 'invoicing'),
-		'IE' => __('Ireland', 'invoicing'),
-		'IM' => __('Isle of Man', 'invoicing'),
-		'IL' => __('Israel', 'invoicing'),
-		'IT' => __('Italy', 'invoicing'),
-		'JM' => __('Jamaica', 'invoicing'),
-		'JP' => __('Japan', 'invoicing'),
-		'JE' => __('Jersey', 'invoicing'),
-		'JO' => __('Jordan', 'invoicing'),
-		'KZ' => __('Kazakhstan', 'invoicing'),
-		'KE' => __('Kenya', 'invoicing'),
-		'KI' => __('Kiribati', 'invoicing'),
-		'KW' => __('Kuwait', 'invoicing'),
-		'KG' => __('Kyrgyzstan', 'invoicing'),
-		'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
-		'LV' => __('Latvia', 'invoicing'),
-		'LB' => __('Lebanon', 'invoicing'),
-		'LS' => __('Lesotho', 'invoicing'),
-		'LR' => __('Liberia', 'invoicing'),
-		'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
-		'LI' => __('Liechtenstein', 'invoicing'),
-		'LT' => __('Lithuania', 'invoicing'),
-		'LU' => __('Luxembourg', 'invoicing'),
-		'MO' => __('Macau', 'invoicing'),
-		'MK' => __('Macedonia', 'invoicing'),
-		'MG' => __('Madagascar', 'invoicing'),
-		'MW' => __('Malawi', 'invoicing'),
-		'MY' => __('Malaysia', 'invoicing'),
-		'MV' => __('Maldives', 'invoicing'),
-		'ML' => __('Mali', 'invoicing'),
-		'MT' => __('Malta', 'invoicing'),
-		'MH' => __('Marshall Islands', 'invoicing'),
-		'MQ' => __('Martinique', 'invoicing'),
-		'MR' => __('Mauritania', 'invoicing'),
-		'MU' => __('Mauritius', 'invoicing'),
-		'YT' => __('Mayotte', 'invoicing'),
-		'MX' => __('Mexico', 'invoicing'),
-		'FM' => __('Micronesia', 'invoicing'),
-		'MD' => __('Moldova, Republic of', 'invoicing'),
-		'MC' => __('Monaco', 'invoicing'),
-		'MN' => __('Mongolia', 'invoicing'),
-		'ME' => __('Montenegro', 'invoicing'),
-		'MS' => __('Montserrat', 'invoicing'),
-		'MA' => __('Morocco', 'invoicing'),
-		'MZ' => __('Mozambique', 'invoicing'),
-		'MM' => __('Myanmar', 'invoicing'),
-		'NA' => __('Namibia', 'invoicing'),
-		'NR' => __('Nauru', 'invoicing'),
-		'NP' => __('Nepal', 'invoicing'),
-		'NL' => __('Netherlands', 'invoicing'),
-		'AN' => __('Netherlands Antilles', 'invoicing'),
-		'NC' => __('New Caledonia', 'invoicing'),
-		'NZ' => __('New Zealand', 'invoicing'),
-		'NI' => __('Nicaragua', 'invoicing'),
-		'NE' => __('Niger', 'invoicing'),
-		'NG' => __('Nigeria', 'invoicing'),
-		'NU' => __('Niue', 'invoicing'),
-		'NF' => __('Norfolk Island', 'invoicing'),
-		'KP' => __('North Korea', 'invoicing'),
-		'MP' => __('Northern Mariana Islands', 'invoicing'),
-		'NO' => __('Norway', 'invoicing'),
-		'OM' => __('Oman', 'invoicing'),
-		'PK' => __('Pakistan', 'invoicing'),
-		'PW' => __('Palau', 'invoicing'),
-		'PS' => __('Palestinian Territories', 'invoicing'),
-		'PA' => __('Panama', 'invoicing'),
-		'PG' => __('Papua New Guinea', 'invoicing'),
-		'PY' => __('Paraguay', 'invoicing'),
-		'PE' => __('Peru', 'invoicing'),
-		'PH' => __('Phillipines', 'invoicing'),
-		'PN' => __('Pitcairn Island', 'invoicing'),
-		'PL' => __('Poland', 'invoicing'),
-		'PT' => __('Portugal', 'invoicing'),
-		'PR' => __('Puerto Rico', 'invoicing'),
-		'QA' => __('Qatar', 'invoicing'),
-		'XK' => __('Republic of Kosovo', 'invoicing'),
-		'RE' => __('Reunion Island', 'invoicing'),
-		'RO' => __('Romania', 'invoicing'),
-		'RU' => __('Russian Federation', 'invoicing'),
-		'RW' => __('Rwanda', 'invoicing'),
-		'BL' => __('Saint Barthélemy', 'invoicing'),
-		'SH' => __('Saint Helena', 'invoicing'),
-		'KN' => __('Saint Kitts and Nevis', 'invoicing'),
-		'LC' => __('Saint Lucia', 'invoicing'),
-		'MF' => __('Saint Martin (French)', 'invoicing'),
-		'SX' => __('Saint Martin (Dutch)', 'invoicing'),
-		'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
-		'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
-		'SM' => __('San Marino', 'invoicing'),
-		'ST' => __('São Tomé and Príncipe', 'invoicing'),
-		'SA' => __('Saudi Arabia', 'invoicing'),
-		'SN' => __('Senegal', 'invoicing'),
-		'RS' => __('Serbia', 'invoicing'),
-		'SC' => __('Seychelles', 'invoicing'),
-		'SL' => __('Sierra Leone', 'invoicing'),
-		'SG' => __('Singapore', 'invoicing'),
-		'SK' => __('Slovak Republic', 'invoicing'),
-		'SI' => __('Slovenia', 'invoicing'),
-		'SB' => __('Solomon Islands', 'invoicing'),
-		'SO' => __('Somalia', 'invoicing'),
-		'ZA' => __('South Africa', 'invoicing'),
-		'GS' => __('South Georgia', 'invoicing'),
-		'KR' => __('South Korea', 'invoicing'),
-		'SS' => __('South Sudan', 'invoicing'),
-		'ES' => __('Spain', 'invoicing'),
-		'LK' => __('Sri Lanka', 'invoicing'),
-		'SD' => __('Sudan', 'invoicing'),
-		'SR' => __('Suriname', 'invoicing'),
-		'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
-		'SZ' => __('Swaziland', 'invoicing'),
-		'SE' => __('Sweden', 'invoicing'),
-		'CH' => __('Switzerland', 'invoicing'),
-		'SY' => __('Syrian Arab Republic', 'invoicing'),
-		'TW' => __('Taiwan', 'invoicing'),
-		'TJ' => __('Tajikistan', 'invoicing'),
-		'TZ' => __('Tanzania', 'invoicing'),
-		'TH' => __('Thailand', 'invoicing'),
-		'TL' => __('Timor-Leste', 'invoicing'),
-		'TG' => __('Togo', 'invoicing'),
-		'TK' => __('Tokelau', 'invoicing'),
-		'TO' => __('Tonga', 'invoicing'),
-		'TT' => __('Trinidad and Tobago', 'invoicing'),
-		'TN' => __('Tunisia', 'invoicing'),
-		'TR' => __('Turkey', 'invoicing'),
-		'TM' => __('Turkmenistan', 'invoicing'),
-		'TC' => __('Turks and Caicos Islands', 'invoicing'),
-		'TV' => __('Tuvalu', 'invoicing'),
-		'UG' => __('Uganda', 'invoicing'),
-		'UA' => __('Ukraine', 'invoicing'),
-		'AE' => __('United Arab Emirates', 'invoicing'),
-		'UY' => __('Uruguay', 'invoicing'),
-		'UM' => __('US Minor Outlying Islands', 'invoicing'),
-		'UZ' => __('Uzbekistan', 'invoicing'),
-		'VU' => __('Vanuatu', 'invoicing'),
-		'VE' => __('Venezuela', 'invoicing'),
-		'VN' => __('Vietnam', 'invoicing'),
-		'VG' => __('Virgin Islands (British)', 'invoicing'),
-		'VI' => __('Virgin Islands (USA)', 'invoicing'),
-		'WF' => __('Wallis and Futuna Islands', 'invoicing'),
-		'EH' => __('Western Sahara', 'invoicing'),
-		'WS' => __('Western Samoa', 'invoicing'),
-		'YE' => __('Yemen', 'invoicing'),
-		'ZM' => __('Zambia', 'invoicing'),
-		'ZW' => __('Zimbabwe', 'invoicing'),
-	);
+    $countries = array(
+        'US' => __('United States', 'invoicing'),
+        'CA' => __('Canada', 'invoicing'),
+        'GB' => __('United Kingdom', 'invoicing'),
+        'AF' => __('Afghanistan', 'invoicing'),
+        'AX' => __('Aland Islands', 'invoicing'),
+        'AL' => __('Albania', 'invoicing'),
+        'DZ' => __('Algeria', 'invoicing'),
+        'AS' => __('American Samoa', 'invoicing'),
+        'AD' => __('Andorra', 'invoicing'),
+        'AO' => __('Angola', 'invoicing'),
+        'AI' => __('Anguilla', 'invoicing'),
+        'AQ' => __('Antarctica', 'invoicing'),
+        'AG' => __('Antigua and Barbuda', 'invoicing'),
+        'AR' => __('Argentina', 'invoicing'),
+        'AM' => __('Armenia', 'invoicing'),
+        'AW' => __('Aruba', 'invoicing'),
+        'AU' => __('Australia', 'invoicing'),
+        'AT' => __('Austria', 'invoicing'),
+        'AZ' => __('Azerbaijan', 'invoicing'),
+        'BS' => __('Bahamas', 'invoicing'),
+        'BH' => __('Bahrain', 'invoicing'),
+        'BD' => __('Bangladesh', 'invoicing'),
+        'BB' => __('Barbados', 'invoicing'),
+        'BY' => __('Belarus', 'invoicing'),
+        'BE' => __('Belgium', 'invoicing'),
+        'BZ' => __('Belize', 'invoicing'),
+        'BJ' => __('Benin', 'invoicing'),
+        'BM' => __('Bermuda', 'invoicing'),
+        'BT' => __('Bhutan', 'invoicing'),
+        'BO' => __('Bolivia', 'invoicing'),
+        'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
+        'BA' => __('Bosnia and Herzegovina', 'invoicing'),
+        'BW' => __('Botswana', 'invoicing'),
+        'BV' => __('Bouvet Island', 'invoicing'),
+        'BR' => __('Brazil', 'invoicing'),
+        'IO' => __('British Indian Ocean Territory', 'invoicing'),
+        'BN' => __('Brunei Darrussalam', 'invoicing'),
+        'BG' => __('Bulgaria', 'invoicing'),
+        'BF' => __('Burkina Faso', 'invoicing'),
+        'BI' => __('Burundi', 'invoicing'),
+        'KH' => __('Cambodia', 'invoicing'),
+        'CM' => __('Cameroon', 'invoicing'),
+        'CV' => __('Cape Verde', 'invoicing'),
+        'KY' => __('Cayman Islands', 'invoicing'),
+        'CF' => __('Central African Republic', 'invoicing'),
+        'TD' => __('Chad', 'invoicing'),
+        'CL' => __('Chile', 'invoicing'),
+        'CN' => __('China', 'invoicing'),
+        'CX' => __('Christmas Island', 'invoicing'),
+        'CC' => __('Cocos Islands', 'invoicing'),
+        'CO' => __('Colombia', 'invoicing'),
+        'KM' => __('Comoros', 'invoicing'),
+        'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
+        'CG' => __('Congo, Republic of', 'invoicing'),
+        'CK' => __('Cook Islands', 'invoicing'),
+        'CR' => __('Costa Rica', 'invoicing'),
+        'CI' => __('Cote d\'Ivoire', 'invoicing'),
+        'HR' => __('Croatia/Hrvatska', 'invoicing'),
+        'CU' => __('Cuba', 'invoicing'),
+        'CW' => __('CuraÇao', 'invoicing'),
+        'CY' => __('Cyprus', 'invoicing'),
+        'CZ' => __('Czech Republic', 'invoicing'),
+        'DK' => __('Denmark', 'invoicing'),
+        'DJ' => __('Djibouti', 'invoicing'),
+        'DM' => __('Dominica', 'invoicing'),
+        'DO' => __('Dominican Republic', 'invoicing'),
+        'TP' => __('East Timor', 'invoicing'),
+        'EC' => __('Ecuador', 'invoicing'),
+        'EG' => __('Egypt', 'invoicing'),
+        'GQ' => __('Equatorial Guinea', 'invoicing'),
+        'SV' => __('El Salvador', 'invoicing'),
+        'ER' => __('Eritrea', 'invoicing'),
+        'EE' => __('Estonia', 'invoicing'),
+        'ET' => __('Ethiopia', 'invoicing'),
+        'FK' => __('Falkland Islands', 'invoicing'),
+        'FO' => __('Faroe Islands', 'invoicing'),
+        'FJ' => __('Fiji', 'invoicing'),
+        'FI' => __('Finland', 'invoicing'),
+        'FR' => __('France', 'invoicing'),
+        'GF' => __('French Guiana', 'invoicing'),
+        'PF' => __('French Polynesia', 'invoicing'),
+        'TF' => __('French Southern Territories', 'invoicing'),
+        'GA' => __('Gabon', 'invoicing'),
+        'GM' => __('Gambia', 'invoicing'),
+        'GE' => __('Georgia', 'invoicing'),
+        'DE' => __('Germany', 'invoicing'),
+        'GR' => __('Greece', 'invoicing'),
+        'GH' => __('Ghana', 'invoicing'),
+        'GI' => __('Gibraltar', 'invoicing'),
+        'GL' => __('Greenland', 'invoicing'),
+        'GD' => __('Grenada', 'invoicing'),
+        'GP' => __('Guadeloupe', 'invoicing'),
+        'GU' => __('Guam', 'invoicing'),
+        'GT' => __('Guatemala', 'invoicing'),
+        'GG' => __('Guernsey', 'invoicing'),
+        'GN' => __('Guinea', 'invoicing'),
+        'GW' => __('Guinea-Bissau', 'invoicing'),
+        'GY' => __('Guyana', 'invoicing'),
+        'HT' => __('Haiti', 'invoicing'),
+        'HM' => __('Heard and McDonald Islands', 'invoicing'),
+        'VA' => __('Holy See (City Vatican State)', 'invoicing'),
+        'HN' => __('Honduras', 'invoicing'),
+        'HK' => __('Hong Kong', 'invoicing'),
+        'HU' => __('Hungary', 'invoicing'),
+        'IS' => __('Iceland', 'invoicing'),
+        'IN' => __('India', 'invoicing'),
+        'ID' => __('Indonesia', 'invoicing'),
+        'IR' => __('Iran', 'invoicing'),
+        'IQ' => __('Iraq', 'invoicing'),
+        'IE' => __('Ireland', 'invoicing'),
+        'IM' => __('Isle of Man', 'invoicing'),
+        'IL' => __('Israel', 'invoicing'),
+        'IT' => __('Italy', 'invoicing'),
+        'JM' => __('Jamaica', 'invoicing'),
+        'JP' => __('Japan', 'invoicing'),
+        'JE' => __('Jersey', 'invoicing'),
+        'JO' => __('Jordan', 'invoicing'),
+        'KZ' => __('Kazakhstan', 'invoicing'),
+        'KE' => __('Kenya', 'invoicing'),
+        'KI' => __('Kiribati', 'invoicing'),
+        'KW' => __('Kuwait', 'invoicing'),
+        'KG' => __('Kyrgyzstan', 'invoicing'),
+        'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
+        'LV' => __('Latvia', 'invoicing'),
+        'LB' => __('Lebanon', 'invoicing'),
+        'LS' => __('Lesotho', 'invoicing'),
+        'LR' => __('Liberia', 'invoicing'),
+        'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
+        'LI' => __('Liechtenstein', 'invoicing'),
+        'LT' => __('Lithuania', 'invoicing'),
+        'LU' => __('Luxembourg', 'invoicing'),
+        'MO' => __('Macau', 'invoicing'),
+        'MK' => __('Macedonia', 'invoicing'),
+        'MG' => __('Madagascar', 'invoicing'),
+        'MW' => __('Malawi', 'invoicing'),
+        'MY' => __('Malaysia', 'invoicing'),
+        'MV' => __('Maldives', 'invoicing'),
+        'ML' => __('Mali', 'invoicing'),
+        'MT' => __('Malta', 'invoicing'),
+        'MH' => __('Marshall Islands', 'invoicing'),
+        'MQ' => __('Martinique', 'invoicing'),
+        'MR' => __('Mauritania', 'invoicing'),
+        'MU' => __('Mauritius', 'invoicing'),
+        'YT' => __('Mayotte', 'invoicing'),
+        'MX' => __('Mexico', 'invoicing'),
+        'FM' => __('Micronesia', 'invoicing'),
+        'MD' => __('Moldova, Republic of', 'invoicing'),
+        'MC' => __('Monaco', 'invoicing'),
+        'MN' => __('Mongolia', 'invoicing'),
+        'ME' => __('Montenegro', 'invoicing'),
+        'MS' => __('Montserrat', 'invoicing'),
+        'MA' => __('Morocco', 'invoicing'),
+        'MZ' => __('Mozambique', 'invoicing'),
+        'MM' => __('Myanmar', 'invoicing'),
+        'NA' => __('Namibia', 'invoicing'),
+        'NR' => __('Nauru', 'invoicing'),
+        'NP' => __('Nepal', 'invoicing'),
+        'NL' => __('Netherlands', 'invoicing'),
+        'AN' => __('Netherlands Antilles', 'invoicing'),
+        'NC' => __('New Caledonia', 'invoicing'),
+        'NZ' => __('New Zealand', 'invoicing'),
+        'NI' => __('Nicaragua', 'invoicing'),
+        'NE' => __('Niger', 'invoicing'),
+        'NG' => __('Nigeria', 'invoicing'),
+        'NU' => __('Niue', 'invoicing'),
+        'NF' => __('Norfolk Island', 'invoicing'),
+        'KP' => __('North Korea', 'invoicing'),
+        'MP' => __('Northern Mariana Islands', 'invoicing'),
+        'NO' => __('Norway', 'invoicing'),
+        'OM' => __('Oman', 'invoicing'),
+        'PK' => __('Pakistan', 'invoicing'),
+        'PW' => __('Palau', 'invoicing'),
+        'PS' => __('Palestinian Territories', 'invoicing'),
+        'PA' => __('Panama', 'invoicing'),
+        'PG' => __('Papua New Guinea', 'invoicing'),
+        'PY' => __('Paraguay', 'invoicing'),
+        'PE' => __('Peru', 'invoicing'),
+        'PH' => __('Phillipines', 'invoicing'),
+        'PN' => __('Pitcairn Island', 'invoicing'),
+        'PL' => __('Poland', 'invoicing'),
+        'PT' => __('Portugal', 'invoicing'),
+        'PR' => __('Puerto Rico', 'invoicing'),
+        'QA' => __('Qatar', 'invoicing'),
+        'XK' => __('Republic of Kosovo', 'invoicing'),
+        'RE' => __('Reunion Island', 'invoicing'),
+        'RO' => __('Romania', 'invoicing'),
+        'RU' => __('Russian Federation', 'invoicing'),
+        'RW' => __('Rwanda', 'invoicing'),
+        'BL' => __('Saint Barthélemy', 'invoicing'),
+        'SH' => __('Saint Helena', 'invoicing'),
+        'KN' => __('Saint Kitts and Nevis', 'invoicing'),
+        'LC' => __('Saint Lucia', 'invoicing'),
+        'MF' => __('Saint Martin (French)', 'invoicing'),
+        'SX' => __('Saint Martin (Dutch)', 'invoicing'),
+        'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
+        'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
+        'SM' => __('San Marino', 'invoicing'),
+        'ST' => __('São Tomé and Príncipe', 'invoicing'),
+        'SA' => __('Saudi Arabia', 'invoicing'),
+        'SN' => __('Senegal', 'invoicing'),
+        'RS' => __('Serbia', 'invoicing'),
+        'SC' => __('Seychelles', 'invoicing'),
+        'SL' => __('Sierra Leone', 'invoicing'),
+        'SG' => __('Singapore', 'invoicing'),
+        'SK' => __('Slovak Republic', 'invoicing'),
+        'SI' => __('Slovenia', 'invoicing'),
+        'SB' => __('Solomon Islands', 'invoicing'),
+        'SO' => __('Somalia', 'invoicing'),
+        'ZA' => __('South Africa', 'invoicing'),
+        'GS' => __('South Georgia', 'invoicing'),
+        'KR' => __('South Korea', 'invoicing'),
+        'SS' => __('South Sudan', 'invoicing'),
+        'ES' => __('Spain', 'invoicing'),
+        'LK' => __('Sri Lanka', 'invoicing'),
+        'SD' => __('Sudan', 'invoicing'),
+        'SR' => __('Suriname', 'invoicing'),
+        'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
+        'SZ' => __('Swaziland', 'invoicing'),
+        'SE' => __('Sweden', 'invoicing'),
+        'CH' => __('Switzerland', 'invoicing'),
+        'SY' => __('Syrian Arab Republic', 'invoicing'),
+        'TW' => __('Taiwan', 'invoicing'),
+        'TJ' => __('Tajikistan', 'invoicing'),
+        'TZ' => __('Tanzania', 'invoicing'),
+        'TH' => __('Thailand', 'invoicing'),
+        'TL' => __('Timor-Leste', 'invoicing'),
+        'TG' => __('Togo', 'invoicing'),
+        'TK' => __('Tokelau', 'invoicing'),
+        'TO' => __('Tonga', 'invoicing'),
+        'TT' => __('Trinidad and Tobago', 'invoicing'),
+        'TN' => __('Tunisia', 'invoicing'),
+        'TR' => __('Turkey', 'invoicing'),
+        'TM' => __('Turkmenistan', 'invoicing'),
+        'TC' => __('Turks and Caicos Islands', 'invoicing'),
+        'TV' => __('Tuvalu', 'invoicing'),
+        'UG' => __('Uganda', 'invoicing'),
+        'UA' => __('Ukraine', 'invoicing'),
+        'AE' => __('United Arab Emirates', 'invoicing'),
+        'UY' => __('Uruguay', 'invoicing'),
+        'UM' => __('US Minor Outlying Islands', 'invoicing'),
+        'UZ' => __('Uzbekistan', 'invoicing'),
+        'VU' => __('Vanuatu', 'invoicing'),
+        'VE' => __('Venezuela', 'invoicing'),
+        'VN' => __('Vietnam', 'invoicing'),
+        'VG' => __('Virgin Islands (British)', 'invoicing'),
+        'VI' => __('Virgin Islands (USA)', 'invoicing'),
+        'WF' => __('Wallis and Futuna Islands', 'invoicing'),
+        'EH' => __('Western Sahara', 'invoicing'),
+        'WS' => __('Western Samoa', 'invoicing'),
+        'YE' => __('Yemen', 'invoicing'),
+        'ZM' => __('Zambia', 'invoicing'),
+        'ZW' => __('Zimbabwe', 'invoicing'),
+    );
     
     if ( $first_empty ) {
         $countries = array_merge( array( '' => '' ), $countries );
@@ -1537,30 +1537,30 @@ 
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if( !empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
         
         $args = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => $sanitized_field_name . ' wpinv-select wpi_select2',
-			'options' => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false
-		);
-
-		$response = wpinv_html_select( $args );
-
-	} else {
-		$response = 'nostates';
-	}
+            'name'    => $sanitized_field_name,
+            'id'      => $sanitized_field_name,
+            'class'   => $sanitized_field_name . ' wpinv-select wpi_select2',
+            'options' => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false
+        );
+
+        $response = wpinv_html_select( $args );
+
+    } else {
+        $response = 'nostates';
+    }
 
-	return $response;
+    return $response;
 }
 
 function wpinv_default_billing_country( $country = '', $user_id = 0 ) {

Spacing +979 added lines, -979 removed lines

@@ -7,67 +7,67 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+	$country = wpinv_get_option('default_country', 'UK');
 
-	return apply_filters( 'wpinv_default_country', $country );
+	return apply_filters('wpinv_default_country', $country);
 }
 
-function wpinv_is_base_country( $country ) {
+function wpinv_is_base_country($country) {
     $base_country = wpinv_get_default_country();
     
-    if ( $base_country === 'UK' ) {
+    if ($base_country === 'UK') {
         $base_country = 'GB';
     }
-    if ( $country == 'UK' ) {
+    if ($country == 'UK') {
         $country = 'GB';
     }
 
-    return ( $country && $country === $base_country ) ? true : false;
+    return ($country && $country === $base_country) ? true : false;
 }
 
-function wpinv_country_name( $country_code = '' ) { 
+function wpinv_country_name($country_code = '') { 
     $countries = wpinv_get_country_list();
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
-    $country = isset( $countries[$country_code] ) ? $countries[$country_code] : $country_code;
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
 
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
+    return apply_filters('wpinv_country_name', $country, $country_code);
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', false );
+	$state = wpinv_get_option('default_state', false);
 
-	return apply_filters( 'wpinv_default_state', $state );
+	return apply_filters('wpinv_default_state', $state);
 }
 
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
+function wpinv_state_name($state_code = '', $country_code = '') {
     $state = $state_code;
     
-    if ( !empty( $country_code ) ) {
-        $states = wpinv_get_country_states( $country_code );
+    if (!empty($country_code)) {
+        $states = wpinv_get_country_states($country_code);
         
-        $state = !empty( $states ) && isset( $states[$state_code] ) ? $states[$state_code] : $state;
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
     }
 
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
 }
 
 function wpinv_store_address() {
-    $address = wpinv_get_option( 'store_address', '' );
+    $address = wpinv_get_option('store_address', '');
 
-    return apply_filters( 'wpinv_store_address', $address );
+    return apply_filters('wpinv_store_address', $address);
 }
 
-function wpinv_get_user_address( $user_id = 0, $with_default = true ) {
+function wpinv_get_user_address($user_id = 0, $with_default = true) {
     global $wpi_userID;
     
-    if( empty( $user_id ) ) {
-        $user_id = !empty( $wpi_userID ) ? $wpi_userID : get_current_user_id();
+    if (empty($user_id)) {
+        $user_id = !empty($wpi_userID) ? $wpi_userID : get_current_user_id();
     }
     
     $address_fields = array(
@@ -85,36 +85,36 @@ 
         'zip',
     );
     
-    $user_info = get_userdata( $user_id );
+    $user_info = get_userdata($user_id);
     
     $address = array();
     $address['user_id'] = $user_id;
-    $address['email'] = !empty( $user_info ) ? $user_info->user_email : '';
-    foreach ( $address_fields as $field ) {
-        $address[$field] = get_user_meta( $user_id, '_wpinv_' . $field, true );
+    $address['email'] = !empty($user_info) ? $user_info->user_email : '';
+    foreach ($address_fields as $field) {
+        $address[$field] = get_user_meta($user_id, '_wpinv_' . $field, true);
     }
 
-    if ( !empty( $user_info ) ) {
-        if( empty( $address['first_name'] ) )
+    if (!empty($user_info)) {
+        if (empty($address['first_name']))
             $address['first_name'] = $user_info->first_name;
         
-        if( empty( $address['last_name'] ) )
+        if (empty($address['last_name']))
             $address['last_name'] = $user_info->last_name;
     }
     
-    $address['name'] = trim( trim( $address['first_name'] . ' ' . $address['last_name'] ), "," );
+    $address['name'] = trim(trim($address['first_name'] . ' ' . $address['last_name']), ",");
     
-    if( empty( $address['state'] ) && $with_default )
+    if (empty($address['state']) && $with_default)
         $address['state'] = wpinv_get_default_state();
 
-    if( empty( $address['country'] ) && $with_default )
+    if (empty($address['country']) && $with_default)
         $address['country'] = wpinv_get_default_country();
 
 
     return $address;
 }
 
-function wpinv_get_country_list( $first_empty = false ) {
+function wpinv_get_country_list($first_empty = false) {
 	$countries = array(
 		'US' => __('United States', 'invoicing'),
 		'CA' => __('Canada', 'invoicing'),
@@ -370,23 +370,23 @@ 
 		'ZW' => __('Zimbabwe', 'invoicing'),
 	);
     
-    if ( $first_empty ) {
-        $countries = array_merge( array( '' => '' ), $countries );
+    if ($first_empty) {
+        $countries = array_merge(array('' => ''), $countries);
     }
     
-    $countries = apply_filters( 'wpinv_countries', $countries );
+    $countries = apply_filters('wpinv_countries', $countries);
     
     asort($countries);
 
     return $countries;
 }
 
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
-    if ( empty( $country ) ) {
+function wpinv_get_country_states($country = null, $first_empty = false) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
 
-    switch( $country ) {
+    switch ($country) {
         case 'US' :
             $states = wpinv_get_us_states_list();
             break;
@@ -461,11 +461,11 @@ 
             break;
     }
     
-    if ( !empty( $states ) && $first_empty ) {
-        $states = array_merge( array( '' => '' ), $states );
+    if (!empty($states) && $first_empty) {
+        $states = array_merge(array('' => ''), $states);
     }
     
-    $states = apply_filters( 'wpinv_country_states', $states, $country );
+    $states = apply_filters('wpinv_country_states', $states, $country);
     
     asort($states);
 
@@ -474,1087 +474,1087 @@ 
 
 function wpinv_get_us_states_list() {
     $states = array(
-        'AL' => __( 'Alabama', 'invoicing' ),
-        'AK' => __( 'Alaska', 'invoicing' ),
-        'AZ' => __( 'Arizona', 'invoicing' ),
-        'AR' => __( 'Arkansas', 'invoicing' ),
-        'CA' => __( 'California', 'invoicing' ),
-        'CO' => __( 'Colorado', 'invoicing' ),
-        'CT' => __( 'Connecticut', 'invoicing' ),
-        'DE' => __( 'Delaware', 'invoicing' ),
-        'DC' => __( 'District of Columbia', 'invoicing' ),
-        'FL' => __( 'Florida', 'invoicing' ),
-        'GA' => __( 'Georgia', 'invoicing' ),
-        'HI' => __( 'Hawaii', 'invoicing' ),
-        'ID' => __( 'Idaho', 'invoicing' ),
-        'IL' => __( 'Illinois', 'invoicing' ),
-        'IN' => __( 'Indiana', 'invoicing' ),
-        'IA' => __( 'Iowa', 'invoicing' ),
-        'KS' => __( 'Kansas', 'invoicing' ),
-        'KY' => __( 'Kentucky', 'invoicing' ),
-        'LA' => __( 'Louisiana', 'invoicing' ),
-        'ME' => __( 'Maine', 'invoicing' ),
-        'MD' => __( 'Maryland', 'invoicing' ),
-        'MA' => __( 'Massachusetts', 'invoicing' ),
-        'MI' => __( 'Michigan', 'invoicing' ),
-        'MN' => __( 'Minnesota', 'invoicing' ),
-        'MS' => __( 'Mississippi', 'invoicing' ),
-        'MO' => __( 'Missouri', 'invoicing' ),
-        'MT' => __( 'Montana', 'invoicing' ),
-        'NE' => __( 'Nebraska', 'invoicing' ),
-        'NV' => __( 'Nevada', 'invoicing' ),
-        'NH' => __( 'New Hampshire', 'invoicing' ),
-        'NJ' => __( 'New Jersey', 'invoicing' ),
-        'NM' => __( 'New Mexico', 'invoicing' ),
-        'NY' => __( 'New York', 'invoicing' ),
-        'NC' => __( 'North Carolina', 'invoicing' ),
-        'ND' => __( 'North Dakota', 'invoicing' ),
-        'OH' => __( 'Ohio', 'invoicing' ),
-        'OK' => __( 'Oklahoma', 'invoicing' ),
-        'OR' => __( 'Oregon', 'invoicing' ),
-        'PA' => __( 'Pennsylvania', 'invoicing' ),
-        'RI' => __( 'Rhode Island', 'invoicing' ),
-        'SC' => __( 'South Carolina', 'invoicing' ),
-        'SD' => __( 'South Dakota', 'invoicing' ),
-        'TN' => __( 'Tennessee', 'invoicing' ),
-        'TX' => __( 'Texas', 'invoicing' ),
-        'UT' => __( 'Utah', 'invoicing' ),
-        'VT' => __( 'Vermont', 'invoicing' ),
-        'VA' => __( 'Virginia', 'invoicing' ),
-        'WA' => __( 'Washington', 'invoicing' ),
-        'WV' => __( 'West Virginia', 'invoicing' ),
-        'WI' => __( 'Wisconsin', 'invoicing' ),
-        'WY' => __( 'Wyoming', 'invoicing' ),
-        'AS' => __( 'American Samoa', 'invoicing' ),
-        'CZ' => __( 'Canal Zone', 'invoicing' ),
-        'CM' => __( 'Commonwealth of the Northern Mariana Islands', 'invoicing' ),
-        'FM' => __( 'Federated States of Micronesia', 'invoicing' ),
-        'GU' => __( 'Guam', 'invoicing' ),
-        'MH' => __( 'Marshall Islands', 'invoicing' ),
-        'MP' => __( 'Northern Mariana Islands', 'invoicing' ),
-        'PW' => __( 'Palau', 'invoicing' ),
-        'PI' => __( 'Philippine Islands', 'invoicing' ),
-        'PR' => __( 'Puerto Rico', 'invoicing' ),
-        'TT' => __( 'Trust Territory of the Pacific Islands', 'invoicing' ),
-        'VI' => __( 'Virgin Islands', 'invoicing' ),
-        'AA' => __( 'Armed Forces - Americas', 'invoicing' ),
-        'AE' => __( 'Armed Forces - Europe, Canada, Middle East, Africa', 'invoicing' ),
-        'AP' => __( 'Armed Forces - Pacific', 'invoicing' )
+        'AL' => __('Alabama', 'invoicing'),
+        'AK' => __('Alaska', 'invoicing'),
+        'AZ' => __('Arizona', 'invoicing'),
+        'AR' => __('Arkansas', 'invoicing'),
+        'CA' => __('California', 'invoicing'),
+        'CO' => __('Colorado', 'invoicing'),
+        'CT' => __('Connecticut', 'invoicing'),
+        'DE' => __('Delaware', 'invoicing'),
+        'DC' => __('District of Columbia', 'invoicing'),
+        'FL' => __('Florida', 'invoicing'),
+        'GA' => __('Georgia', 'invoicing'),
+        'HI' => __('Hawaii', 'invoicing'),
+        'ID' => __('Idaho', 'invoicing'),
+        'IL' => __('Illinois', 'invoicing'),
+        'IN' => __('Indiana', 'invoicing'),
+        'IA' => __('Iowa', 'invoicing'),
+        'KS' => __('Kansas', 'invoicing'),
+        'KY' => __('Kentucky', 'invoicing'),
+        'LA' => __('Louisiana', 'invoicing'),
+        'ME' => __('Maine', 'invoicing'),
+        'MD' => __('Maryland', 'invoicing'),
+        'MA' => __('Massachusetts', 'invoicing'),
+        'MI' => __('Michigan', 'invoicing'),
+        'MN' => __('Minnesota', 'invoicing'),
+        'MS' => __('Mississippi', 'invoicing'),
+        'MO' => __('Missouri', 'invoicing'),
+        'MT' => __('Montana', 'invoicing'),
+        'NE' => __('Nebraska', 'invoicing'),
+        'NV' => __('Nevada', 'invoicing'),
+        'NH' => __('New Hampshire', 'invoicing'),
+        'NJ' => __('New Jersey', 'invoicing'),
+        'NM' => __('New Mexico', 'invoicing'),
+        'NY' => __('New York', 'invoicing'),
+        'NC' => __('North Carolina', 'invoicing'),
+        'ND' => __('North Dakota', 'invoicing'),
+        'OH' => __('Ohio', 'invoicing'),
+        'OK' => __('Oklahoma', 'invoicing'),
+        'OR' => __('Oregon', 'invoicing'),
+        'PA' => __('Pennsylvania', 'invoicing'),
+        'RI' => __('Rhode Island', 'invoicing'),
+        'SC' => __('South Carolina', 'invoicing'),
+        'SD' => __('South Dakota', 'invoicing'),
+        'TN' => __('Tennessee', 'invoicing'),
+        'TX' => __('Texas', 'invoicing'),
+        'UT' => __('Utah', 'invoicing'),
+        'VT' => __('Vermont', 'invoicing'),
+        'VA' => __('Virginia', 'invoicing'),
+        'WA' => __('Washington', 'invoicing'),
+        'WV' => __('West Virginia', 'invoicing'),
+        'WI' => __('Wisconsin', 'invoicing'),
+        'WY' => __('Wyoming', 'invoicing'),
+        'AS' => __('American Samoa', 'invoicing'),
+        'CZ' => __('Canal Zone', 'invoicing'),
+        'CM' => __('Commonwealth of the Northern Mariana Islands', 'invoicing'),
+        'FM' => __('Federated States of Micronesia', 'invoicing'),
+        'GU' => __('Guam', 'invoicing'),
+        'MH' => __('Marshall Islands', 'invoicing'),
+        'MP' => __('Northern Mariana Islands', 'invoicing'),
+        'PW' => __('Palau', 'invoicing'),
+        'PI' => __('Philippine Islands', 'invoicing'),
+        'PR' => __('Puerto Rico', 'invoicing'),
+        'TT' => __('Trust Territory of the Pacific Islands', 'invoicing'),
+        'VI' => __('Virgin Islands', 'invoicing'),
+        'AA' => __('Armed Forces - Americas', 'invoicing'),
+        'AE' => __('Armed Forces - Europe, Canada, Middle East, Africa', 'invoicing'),
+        'AP' => __('Armed Forces - Pacific', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_us_states', $states );
+    return apply_filters('wpinv_us_states', $states);
 }
 
 function wpinv_get_canada_states_list() {
     $states = array(
-        'AB' => __( 'Alberta', 'invoicing' ),
-        'BC' => __( 'British Columbia', 'invoicing' ),
-        'MB' => __( 'Manitoba', 'invoicing' ),
-        'NB' => __( 'New Brunswick', 'invoicing' ),
-        'NL' => __( 'Newfoundland and Labrador', 'invoicing' ),
-        'NS' => __( 'Nova Scotia', 'invoicing' ),
-        'NT' => __( 'Northwest Territories', 'invoicing' ),
-        'NU' => __( 'Nunavut', 'invoicing' ),
-        'ON' => __( 'Ontario', 'invoicing' ),
-        'PE' => __( 'Prince Edward Island', 'invoicing' ),
-        'QC' => __( 'Quebec', 'invoicing' ),
-        'SK' => __( 'Saskatchewan', 'invoicing' ),
-        'YT' => __( 'Yukon', 'invoicing' )
+        'AB' => __('Alberta', 'invoicing'),
+        'BC' => __('British Columbia', 'invoicing'),
+        'MB' => __('Manitoba', 'invoicing'),
+        'NB' => __('New Brunswick', 'invoicing'),
+        'NL' => __('Newfoundland and Labrador', 'invoicing'),
+        'NS' => __('Nova Scotia', 'invoicing'),
+        'NT' => __('Northwest Territories', 'invoicing'),
+        'NU' => __('Nunavut', 'invoicing'),
+        'ON' => __('Ontario', 'invoicing'),
+        'PE' => __('Prince Edward Island', 'invoicing'),
+        'QC' => __('Quebec', 'invoicing'),
+        'SK' => __('Saskatchewan', 'invoicing'),
+        'YT' => __('Yukon', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_canada_provinces', $states );
+    return apply_filters('wpinv_canada_provinces', $states);
 }
 
 function wpinv_get_australia_states_list() {
     $states = array(
-        'ACT' => __( 'Australian Capital Territory', 'invoicing' ),
-        'NSW' => __( 'New South Wales', 'invoicing' ),
-        'NT'  => __( 'Northern Territory', 'invoicing' ),
-        'QLD' => __( 'Queensland', 'invoicing' ),
-        'SA'  => __( 'South Australia', 'invoicing' ),
-        'TAS' => __( 'Tasmania', 'invoicing' ),
-        'VIC' => __( 'Victoria', 'invoicing' ),
-        'WA'  => __( 'Western Australia', 'invoicing' )
+        'ACT' => __('Australian Capital Territory', 'invoicing'),
+        'NSW' => __('New South Wales', 'invoicing'),
+        'NT'  => __('Northern Territory', 'invoicing'),
+        'QLD' => __('Queensland', 'invoicing'),
+        'SA'  => __('South Australia', 'invoicing'),
+        'TAS' => __('Tasmania', 'invoicing'),
+        'VIC' => __('Victoria', 'invoicing'),
+        'WA'  => __('Western Australia', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_australia_states', $states );
+    return apply_filters('wpinv_australia_states', $states);
 }
 
 function wpinv_get_bangladesh_states_list() {
     $states = array(
-        'BAG' => __( 'Bagerhat', 'invoicing' ),
-        'BAN' => __( 'Bandarban', 'invoicing' ),
-        'BAR' => __( 'Barguna', 'invoicing' ),
-        'BARI'=> __( 'Barisal', 'invoicing' ),
-        'BHO' => __( 'Bhola', 'invoicing' ),
-        'BOG' => __( 'Bogra', 'invoicing' ),
-        'BRA' => __( 'Brahmanbaria', 'invoicing' ),
-        'CHA' => __( 'Chandpur', 'invoicing' ),
-        'CHI' => __( 'Chittagong', 'invoicing' ),
-        'CHU' => __( 'Chuadanga', 'invoicing' ),
-        'COM' => __( 'Comilla', 'invoicing' ),
-        'COX' => __( 'Cox\'s Bazar', 'invoicing' ),
-        'DHA' => __( 'Dhaka', 'invoicing' ),
-        'DIN' => __( 'Dinajpur', 'invoicing' ),
-        'FAR' => __( 'Faridpur', 'invoicing' ),
-        'FEN' => __( 'Feni', 'invoicing' ),
-        'GAI' => __( 'Gaibandha', 'invoicing' ),
-        'GAZI'=> __( 'Gazipur', 'invoicing' ),
-        'GOP' => __( 'Gopalganj', 'invoicing' ),
-        'HAB' => __( 'Habiganj', 'invoicing' ),
-        'JAM' => __( 'Jamalpur', 'invoicing' ),
-        'JES' => __( 'Jessore', 'invoicing' ),
-        'JHA' => __( 'Jhalokati', 'invoicing' ),
-        'JHE' => __( 'Jhenaidah', 'invoicing' ),
-        'JOY' => __( 'Joypurhat', 'invoicing' ),
-        'KHA' => __( 'Khagrachhari', 'invoicing' ),
-        'KHU' => __( 'Khulna', 'invoicing' ),
-        'KIS' => __( 'Kishoreganj', 'invoicing' ),
-        'KUR' => __( 'Kurigram', 'invoicing' ),
-        'KUS' => __( 'Kushtia', 'invoicing' ),
-        'LAK' => __( 'Lakshmipur', 'invoicing' ),
-        'LAL' => __( 'Lalmonirhat', 'invoicing' ),
-        'MAD' => __( 'Madaripur', 'invoicing' ),
-        'MAG' => __( 'Magura', 'invoicing' ),
-        'MAN' => __( 'Manikganj', 'invoicing' ),
-        'MEH' => __( 'Meherpur', 'invoicing' ),
-        'MOU' => __( 'Moulvibazar', 'invoicing' ),
-        'MUN' => __( 'Munshiganj', 'invoicing' ),
-        'MYM' => __( 'Mymensingh', 'invoicing' ),
-        'NAO' => __( 'Naogaon', 'invoicing' ),
-        'NAR' => __( 'Narail', 'invoicing' ),
-        'NARG'=> __( 'Narayanganj', 'invoicing' ),
-        'NARD'=> __( 'Narsingdi', 'invoicing' ),
-        'NAT' => __( 'Natore', 'invoicing' ),
-        'NAW' => __( 'Nawabganj', 'invoicing' ),
-        'NET' => __( 'Netrakona', 'invoicing' ),
-        'NIL' => __( 'Nilphamari', 'invoicing' ),
-        'NOA' => __( 'Noakhali', 'invoicing' ),
-        'PAB' => __( 'Pabna', 'invoicing' ),
-        'PAN' => __( 'Panchagarh', 'invoicing' ),
-        'PAT' => __( 'Patuakhali', 'invoicing' ),
-        'PIR' => __( 'Pirojpur', 'invoicing' ),
-        'RAJB'=> __( 'Rajbari', 'invoicing' ),
-        'RAJ' => __( 'Rajshahi', 'invoicing' ),
-        'RAN' => __( 'Rangamati', 'invoicing' ),
-        'RANP'=> __( 'Rangpur', 'invoicing' ),
-        'SAT' => __( 'Satkhira', 'invoicing' ),
-        'SHA' => __( 'Shariatpur', 'invoicing' ),
-        'SHE' => __( 'Sherpur', 'invoicing' ),
-        'SIR' => __( 'Sirajganj', 'invoicing' ),
-        'SUN' => __( 'Sunamganj', 'invoicing' ),
-        'SYL' => __( 'Sylhet', 'invoicing' ),
-        'TAN' => __( 'Tangail', 'invoicing' ),
-        'THA' => __( 'Thakurgaon', 'invoicing' )
+        'BAG' => __('Bagerhat', 'invoicing'),
+        'BAN' => __('Bandarban', 'invoicing'),
+        'BAR' => __('Barguna', 'invoicing'),
+        'BARI'=> __('Barisal', 'invoicing'),
+        'BHO' => __('Bhola', 'invoicing'),
+        'BOG' => __('Bogra', 'invoicing'),
+        'BRA' => __('Brahmanbaria', 'invoicing'),
+        'CHA' => __('Chandpur', 'invoicing'),
+        'CHI' => __('Chittagong', 'invoicing'),
+        'CHU' => __('Chuadanga', 'invoicing'),
+        'COM' => __('Comilla', 'invoicing'),
+        'COX' => __('Cox\'s Bazar', 'invoicing'),
+        'DHA' => __('Dhaka', 'invoicing'),
+        'DIN' => __('Dinajpur', 'invoicing'),
+        'FAR' => __('Faridpur', 'invoicing'),
+        'FEN' => __('Feni', 'invoicing'),
+        'GAI' => __('Gaibandha', 'invoicing'),
+        'GAZI'=> __('Gazipur', 'invoicing'),
+        'GOP' => __('Gopalganj', 'invoicing'),
+        'HAB' => __('Habiganj', 'invoicing'),
+        'JAM' => __('Jamalpur', 'invoicing'),
+        'JES' => __('Jessore', 'invoicing'),
+        'JHA' => __('Jhalokati', 'invoicing'),
+        'JHE' => __('Jhenaidah', 'invoicing'),
+        'JOY' => __('Joypurhat', 'invoicing'),
+        'KHA' => __('Khagrachhari', 'invoicing'),
+        'KHU' => __('Khulna', 'invoicing'),
+        'KIS' => __('Kishoreganj', 'invoicing'),
+        'KUR' => __('Kurigram', 'invoicing'),
+        'KUS' => __('Kushtia', 'invoicing'),
+        'LAK' => __('Lakshmipur', 'invoicing'),
+        'LAL' => __('Lalmonirhat', 'invoicing'),
+        'MAD' => __('Madaripur', 'invoicing'),
+        'MAG' => __('Magura', 'invoicing'),
+        'MAN' => __('Manikganj', 'invoicing'),
+        'MEH' => __('Meherpur', 'invoicing'),
+        'MOU' => __('Moulvibazar', 'invoicing'),
+        'MUN' => __('Munshiganj', 'invoicing'),
+        'MYM' => __('Mymensingh', 'invoicing'),
+        'NAO' => __('Naogaon', 'invoicing'),
+        'NAR' => __('Narail', 'invoicing'),
+        'NARG'=> __('Narayanganj', 'invoicing'),
+        'NARD'=> __('Narsingdi', 'invoicing'),
+        'NAT' => __('Natore', 'invoicing'),
+        'NAW' => __('Nawabganj', 'invoicing'),
+        'NET' => __('Netrakona', 'invoicing'),
+        'NIL' => __('Nilphamari', 'invoicing'),
+        'NOA' => __('Noakhali', 'invoicing'),
+        'PAB' => __('Pabna', 'invoicing'),
+        'PAN' => __('Panchagarh', 'invoicing'),
+        'PAT' => __('Patuakhali', 'invoicing'),
+        'PIR' => __('Pirojpur', 'invoicing'),
+        'RAJB'=> __('Rajbari', 'invoicing'),
+        'RAJ' => __('Rajshahi', 'invoicing'),
+        'RAN' => __('Rangamati', 'invoicing'),
+        'RANP'=> __('Rangpur', 'invoicing'),
+        'SAT' => __('Satkhira', 'invoicing'),
+        'SHA' => __('Shariatpur', 'invoicing'),
+        'SHE' => __('Sherpur', 'invoicing'),
+        'SIR' => __('Sirajganj', 'invoicing'),
+        'SUN' => __('Sunamganj', 'invoicing'),
+        'SYL' => __('Sylhet', 'invoicing'),
+        'TAN' => __('Tangail', 'invoicing'),
+        'THA' => __('Thakurgaon', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_bangladesh_states', $states );
+    return apply_filters('wpinv_bangladesh_states', $states);
 }
 
 function wpinv_get_brazil_states_list() {
     $states = array(
-        'AC' => __( 'Acre', 'invoicing' ),
-        'AL' => __( 'Alagoas', 'invoicing' ),
-        'AP' => __( 'Amapá', 'invoicing' ),
-        'AM' => __( 'Amazonas', 'invoicing' ),
-        'BA' => __( 'Bahia', 'invoicing' ),
-        'CE' => __( 'Ceará', 'invoicing' ),
-        'DF' => __( 'Distrito Federal', 'invoicing' ),
-        'ES' => __( 'Espírito Santo', 'invoicing' ),
-        'GO' => __( 'Goiás', 'invoicing' ),
-        'MA' => __( 'Maranhão', 'invoicing' ),
-        'MT' => __( 'Mato Grosso', 'invoicing' ),
-        'MS' => __( 'Mato Grosso do Sul', 'invoicing' ),
-        'MG' => __( 'Minas Gerais', 'invoicing' ),
-        'PA' => __( 'Pará', 'invoicing' ),
-        'PB' => __( 'Paraíba', 'invoicing' ),
-        'PR' => __( 'Paraná', 'invoicing' ),
-        'PE' => __( 'Pernambuco', 'invoicing' ),
-        'PI' => __( 'Piauí', 'invoicing' ),
-        'RJ' => __( 'Rio de Janeiro', 'invoicing' ),
-        'RN' => __( 'Rio Grande do Norte', 'invoicing' ),
-        'RS' => __( 'Rio Grande do Sul', 'invoicing' ),
-        'RO' => __( 'Rondônia', 'invoicing' ),
-        'RR' => __( 'Roraima', 'invoicing' ),
-        'SC' => __( 'Santa Catarina', 'invoicing' ),
-        'SP' => __( 'São Paulo', 'invoicing' ),
-        'SE' => __( 'Sergipe', 'invoicing' ),
-        'TO' => __( 'Tocantins', 'invoicing' )
+        'AC' => __('Acre', 'invoicing'),
+        'AL' => __('Alagoas', 'invoicing'),
+        'AP' => __('Amapá', 'invoicing'),
+        'AM' => __('Amazonas', 'invoicing'),
+        'BA' => __('Bahia', 'invoicing'),
+        'CE' => __('Ceará', 'invoicing'),
+        'DF' => __('Distrito Federal', 'invoicing'),
+        'ES' => __('Espírito Santo', 'invoicing'),
+        'GO' => __('Goiás', 'invoicing'),
+        'MA' => __('Maranhão', 'invoicing'),
+        'MT' => __('Mato Grosso', 'invoicing'),
+        'MS' => __('Mato Grosso do Sul', 'invoicing'),
+        'MG' => __('Minas Gerais', 'invoicing'),
+        'PA' => __('Pará', 'invoicing'),
+        'PB' => __('Paraíba', 'invoicing'),
+        'PR' => __('Paraná', 'invoicing'),
+        'PE' => __('Pernambuco', 'invoicing'),
+        'PI' => __('Piauí', 'invoicing'),
+        'RJ' => __('Rio de Janeiro', 'invoicing'),
+        'RN' => __('Rio Grande do Norte', 'invoicing'),
+        'RS' => __('Rio Grande do Sul', 'invoicing'),
+        'RO' => __('Rondônia', 'invoicing'),
+        'RR' => __('Roraima', 'invoicing'),
+        'SC' => __('Santa Catarina', 'invoicing'),
+        'SP' => __('São Paulo', 'invoicing'),
+        'SE' => __('Sergipe', 'invoicing'),
+        'TO' => __('Tocantins', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_brazil_states', $states );
+    return apply_filters('wpinv_brazil_states', $states);
 }
 
 function wpinv_get_bulgaria_states_list() {
     $states = array(
-        'BG-01' => __( 'Blagoevgrad', 'invoicing' ),
-        'BG-02' => __( 'Burgas', 'invoicing' ),
-        'BG-08' => __( 'Dobrich', 'invoicing' ),
-        'BG-07' => __( 'Gabrovo', 'invoicing' ),
-        'BG-26' => __( 'Haskovo', 'invoicing' ),
-        'BG-09' => __( 'Kardzhali', 'invoicing' ),
-        'BG-10' => __( 'Kyustendil', 'invoicing' ),
-        'BG-11' => __( 'Lovech', 'invoicing' ),
-        'BG-12' => __( 'Montana', 'invoicing' ),
-        'BG-13' => __( 'Pazardzhik', 'invoicing' ),
-        'BG-14' => __( 'Pernik', 'invoicing' ),
-        'BG-15' => __( 'Pleven', 'invoicing' ),
-        'BG-16' => __( 'Plovdiv', 'invoicing' ),
-        'BG-17' => __( 'Razgrad', 'invoicing' ),
-        'BG-18' => __( 'Ruse', 'invoicing' ),
-        'BG-27' => __( 'Shumen', 'invoicing' ),
-        'BG-19' => __( 'Silistra', 'invoicing' ),
-        'BG-20' => __( 'Sliven', 'invoicing' ),
-        'BG-21' => __( 'Smolyan', 'invoicing' ),
-        'BG-23' => __( 'Sofia', 'invoicing' ),
-        'BG-22' => __( 'Sofia-Grad', 'invoicing' ),
-        'BG-24' => __( 'Stara Zagora', 'invoicing' ),
-        'BG-25' => __( 'Targovishte', 'invoicing' ),
-        'BG-03' => __( 'Varna', 'invoicing' ),
-        'BG-04' => __( 'Veliko Tarnovo', 'invoicing' ),
-        'BG-05' => __( 'Vidin', 'invoicing' ),
-        'BG-06' => __( 'Vratsa', 'invoicing' ),
-        'BG-28' => __( 'Yambol', 'invoicing' )
+        'BG-01' => __('Blagoevgrad', 'invoicing'),
+        'BG-02' => __('Burgas', 'invoicing'),
+        'BG-08' => __('Dobrich', 'invoicing'),
+        'BG-07' => __('Gabrovo', 'invoicing'),
+        'BG-26' => __('Haskovo', 'invoicing'),
+        'BG-09' => __('Kardzhali', 'invoicing'),
+        'BG-10' => __('Kyustendil', 'invoicing'),
+        'BG-11' => __('Lovech', 'invoicing'),
+        'BG-12' => __('Montana', 'invoicing'),
+        'BG-13' => __('Pazardzhik', 'invoicing'),
+        'BG-14' => __('Pernik', 'invoicing'),
+        'BG-15' => __('Pleven', 'invoicing'),
+        'BG-16' => __('Plovdiv', 'invoicing'),
+        'BG-17' => __('Razgrad', 'invoicing'),
+        'BG-18' => __('Ruse', 'invoicing'),
+        'BG-27' => __('Shumen', 'invoicing'),
+        'BG-19' => __('Silistra', 'invoicing'),
+        'BG-20' => __('Sliven', 'invoicing'),
+        'BG-21' => __('Smolyan', 'invoicing'),
+        'BG-23' => __('Sofia', 'invoicing'),
+        'BG-22' => __('Sofia-Grad', 'invoicing'),
+        'BG-24' => __('Stara Zagora', 'invoicing'),
+        'BG-25' => __('Targovishte', 'invoicing'),
+        'BG-03' => __('Varna', 'invoicing'),
+        'BG-04' => __('Veliko Tarnovo', 'invoicing'),
+        'BG-05' => __('Vidin', 'invoicing'),
+        'BG-06' => __('Vratsa', 'invoicing'),
+        'BG-28' => __('Yambol', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_bulgaria_states', $states );
+    return apply_filters('wpinv_bulgaria_states', $states);
 }
 
 function wpinv_get_hong_kong_states_list() {
     $states = array(
-        'HONG KONG'       => __( 'Hong Kong Island', 'invoicing' ),
-        'KOWLOON'         => __( 'Kowloon', 'invoicing' ),
-        'NEW TERRITORIES' => __( 'New Territories', 'invoicing' )
+        'HONG KONG'       => __('Hong Kong Island', 'invoicing'),
+        'KOWLOON'         => __('Kowloon', 'invoicing'),
+        'NEW TERRITORIES' => __('New Territories', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_hong_kong_states', $states );
+    return apply_filters('wpinv_hong_kong_states', $states);
 }
 
 function wpinv_get_hungary_states_list() {
     $states = array(
-        'BK' => __( 'Bács-Kiskun', 'invoicing' ),
-        'BE' => __( 'Békés', 'invoicing' ),
-        'BA' => __( 'Baranya', 'invoicing' ),
-        'BZ' => __( 'Borsod-Abaúj-Zemplén', 'invoicing' ),
-        'BU' => __( 'Budapest', 'invoicing' ),
-        'CS' => __( 'Csongrád', 'invoicing' ),
-        'FE' => __( 'Fejér', 'invoicing' ),
-        'GS' => __( 'Győr-Moson-Sopron', 'invoicing' ),
-        'HB' => __( 'Hajdú-Bihar', 'invoicing' ),
-        'HE' => __( 'Heves', 'invoicing' ),
-        'JN' => __( 'Jász-Nagykun-Szolnok', 'invoicing' ),
-        'KE' => __( 'Komárom-Esztergom', 'invoicing' ),
-        'NO' => __( 'Nógrád', 'invoicing' ),
-        'PE' => __( 'Pest', 'invoicing' ),
-        'SO' => __( 'Somogy', 'invoicing' ),
-        'SZ' => __( 'Szabolcs-Szatmár-Bereg', 'invoicing' ),
-        'TO' => __( 'Tolna', 'invoicing' ),
-        'VA' => __( 'Vas', 'invoicing' ),
-        'VE' => __( 'Veszprém', 'invoicing' ),
-        'ZA' => __( 'Zala', 'invoicing' )
+        'BK' => __('Bács-Kiskun', 'invoicing'),
+        'BE' => __('Békés', 'invoicing'),
+        'BA' => __('Baranya', 'invoicing'),
+        'BZ' => __('Borsod-Abaúj-Zemplén', 'invoicing'),
+        'BU' => __('Budapest', 'invoicing'),
+        'CS' => __('Csongrád', 'invoicing'),
+        'FE' => __('Fejér', 'invoicing'),
+        'GS' => __('Győr-Moson-Sopron', 'invoicing'),
+        'HB' => __('Hajdú-Bihar', 'invoicing'),
+        'HE' => __('Heves', 'invoicing'),
+        'JN' => __('Jász-Nagykun-Szolnok', 'invoicing'),
+        'KE' => __('Komárom-Esztergom', 'invoicing'),
+        'NO' => __('Nógrád', 'invoicing'),
+        'PE' => __('Pest', 'invoicing'),
+        'SO' => __('Somogy', 'invoicing'),
+        'SZ' => __('Szabolcs-Szatmár-Bereg', 'invoicing'),
+        'TO' => __('Tolna', 'invoicing'),
+        'VA' => __('Vas', 'invoicing'),
+        'VE' => __('Veszprém', 'invoicing'),
+        'ZA' => __('Zala', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_hungary_states', $states );
+    return apply_filters('wpinv_hungary_states', $states);
 }
 
 function wpinv_get_japan_states_list() {
     $states = array(
-        'JP01' => __( 'Hokkaido', 'invoicing' ),
-        'JP02' => __( 'Aomori', 'invoicing' ),
-        'JP03' => __( 'Iwate', 'invoicing' ),
-        'JP04' => __( 'Miyagi', 'invoicing' ),
-        'JP05' => __( 'Akita', 'invoicing' ),
-        'JP06' => __( 'Yamagata', 'invoicing' ),
-        'JP07' => __( 'Fukushima', 'invoicing' ),
-        'JP08' => __( 'Ibaraki', 'invoicing' ),
-        'JP09' => __( 'Tochigi', 'invoicing' ),
-        'JP10' => __( 'Gunma', 'invoicing' ),
-        'JP11' => __( 'Saitama', 'invoicing' ),
-        'JP12' => __( 'Chiba', 'invoicing' ),
-        'JP13' => __( 'Tokyo', 'invoicing' ),
-        'JP14' => __( 'Kanagawa', 'invoicing' ),
-        'JP15' => __( 'Niigata', 'invoicing' ),
-        'JP16' => __( 'Toyama', 'invoicing' ),
-        'JP17' => __( 'Ishikawa', 'invoicing' ),
-        'JP18' => __( 'Fukui', 'invoicing' ),
-        'JP19' => __( 'Yamanashi', 'invoicing' ),
-        'JP20' => __( 'Nagano', 'invoicing' ),
-        'JP21' => __( 'Gifu', 'invoicing' ),
-        'JP22' => __( 'Shizuoka', 'invoicing' ),
-        'JP23' => __( 'Aichi', 'invoicing' ),
-        'JP24' => __( 'Mie', 'invoicing' ),
-        'JP25' => __( 'Shiga', 'invoicing' ),
-        'JP26' => __( 'Kyouto', 'invoicing' ),
-        'JP27' => __( 'Osaka', 'invoicing' ),
-        'JP28' => __( 'Hyougo', 'invoicing' ),
-        'JP29' => __( 'Nara', 'invoicing' ),
-        'JP30' => __( 'Wakayama', 'invoicing' ),
-        'JP31' => __( 'Tottori', 'invoicing' ),
-        'JP32' => __( 'Shimane', 'invoicing' ),
-        'JP33' => __( 'Okayama', 'invoicing' ),
-        'JP34' => __( 'Hiroshima', 'invoicing' ),
-        'JP35' => __( 'Yamaguchi', 'invoicing' ),
-        'JP36' => __( 'Tokushima', 'invoicing' ),
-        'JP37' => __( 'Kagawa', 'invoicing' ),
-        'JP38' => __( 'Ehime', 'invoicing' ),
-        'JP39' => __( 'Kochi', 'invoicing' ),
-        'JP40' => __( 'Fukuoka', 'invoicing' ),
-        'JP41' => __( 'Saga', 'invoicing' ),
-        'JP42' => __( 'Nagasaki', 'invoicing' ),
-        'JP43' => __( 'Kumamoto', 'invoicing' ),
-        'JP44' => __( 'Oita', 'invoicing' ),
-        'JP45' => __( 'Miyazaki', 'invoicing' ),
-        'JP46' => __( 'Kagoshima', 'invoicing' ),
-        'JP47' => __( 'Okinawa', 'invoicing' )
+        'JP01' => __('Hokkaido', 'invoicing'),
+        'JP02' => __('Aomori', 'invoicing'),
+        'JP03' => __('Iwate', 'invoicing'),
+        'JP04' => __('Miyagi', 'invoicing'),
+        'JP05' => __('Akita', 'invoicing'),
+        'JP06' => __('Yamagata', 'invoicing'),
+        'JP07' => __('Fukushima', 'invoicing'),
+        'JP08' => __('Ibaraki', 'invoicing'),
+        'JP09' => __('Tochigi', 'invoicing'),
+        'JP10' => __('Gunma', 'invoicing'),
+        'JP11' => __('Saitama', 'invoicing'),
+        'JP12' => __('Chiba', 'invoicing'),
+        'JP13' => __('Tokyo', 'invoicing'),
+        'JP14' => __('Kanagawa', 'invoicing'),
+        'JP15' => __('Niigata', 'invoicing'),
+        'JP16' => __('Toyama', 'invoicing'),
+        'JP17' => __('Ishikawa', 'invoicing'),
+        'JP18' => __('Fukui', 'invoicing'),
+        'JP19' => __('Yamanashi', 'invoicing'),
+        'JP20' => __('Nagano', 'invoicing'),
+        'JP21' => __('Gifu', 'invoicing'),
+        'JP22' => __('Shizuoka', 'invoicing'),
+        'JP23' => __('Aichi', 'invoicing'),
+        'JP24' => __('Mie', 'invoicing'),
+        'JP25' => __('Shiga', 'invoicing'),
+        'JP26' => __('Kyouto', 'invoicing'),
+        'JP27' => __('Osaka', 'invoicing'),
+        'JP28' => __('Hyougo', 'invoicing'),
+        'JP29' => __('Nara', 'invoicing'),
+        'JP30' => __('Wakayama', 'invoicing'),
+        'JP31' => __('Tottori', 'invoicing'),
+        'JP32' => __('Shimane', 'invoicing'),
+        'JP33' => __('Okayama', 'invoicing'),
+        'JP34' => __('Hiroshima', 'invoicing'),
+        'JP35' => __('Yamaguchi', 'invoicing'),
+        'JP36' => __('Tokushima', 'invoicing'),
+        'JP37' => __('Kagawa', 'invoicing'),
+        'JP38' => __('Ehime', 'invoicing'),
+        'JP39' => __('Kochi', 'invoicing'),
+        'JP40' => __('Fukuoka', 'invoicing'),
+        'JP41' => __('Saga', 'invoicing'),
+        'JP42' => __('Nagasaki', 'invoicing'),
+        'JP43' => __('Kumamoto', 'invoicing'),
+        'JP44' => __('Oita', 'invoicing'),
+        'JP45' => __('Miyazaki', 'invoicing'),
+        'JP46' => __('Kagoshima', 'invoicing'),
+        'JP47' => __('Okinawa', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_japan_states', $states );
+    return apply_filters('wpinv_japan_states', $states);
 }
 
 function wpinv_get_china_states_list() {
     $states = array(
-        'CN1'  => __( 'Yunnan / 云南', 'invoicing' ),
-        'CN2'  => __( 'Beijing / 北京', 'invoicing' ),
-        'CN3'  => __( 'Tianjin / 天津', 'invoicing' ),
-        'CN4'  => __( 'Hebei / 河北', 'invoicing' ),
-        'CN5'  => __( 'Shanxi / 山西', 'invoicing' ),
-        'CN6'  => __( 'Inner Mongolia / 內蒙古', 'invoicing' ),
-        'CN7'  => __( 'Liaoning / 辽宁', 'invoicing' ),
-        'CN8'  => __( 'Jilin / 吉林', 'invoicing' ),
-        'CN9'  => __( 'Heilongjiang / 黑龙江', 'invoicing' ),
-        'CN10' => __( 'Shanghai / 上海', 'invoicing' ),
-        'CN11' => __( 'Jiangsu / 江苏', 'invoicing' ),
-        'CN12' => __( 'Zhejiang / 浙江', 'invoicing' ),
-        'CN13' => __( 'Anhui / 安徽', 'invoicing' ),
-        'CN14' => __( 'Fujian / 福建', 'invoicing' ),
-        'CN15' => __( 'Jiangxi / 江西', 'invoicing' ),
-        'CN16' => __( 'Shandong / 山东', 'invoicing' ),
-        'CN17' => __( 'Henan / 河南', 'invoicing' ),
-        'CN18' => __( 'Hubei / 湖北', 'invoicing' ),
-        'CN19' => __( 'Hunan / 湖南', 'invoicing' ),
-        'CN20' => __( 'Guangdong / 广东', 'invoicing' ),
-        'CN21' => __( 'Guangxi Zhuang / 广西壮族', 'invoicing' ),
-        'CN22' => __( 'Hainan / 海南', 'invoicing' ),
-        'CN23' => __( 'Chongqing / 重庆', 'invoicing' ),
-        'CN24' => __( 'Sichuan / 四川', 'invoicing' ),
-        'CN25' => __( 'Guizhou / 贵州', 'invoicing' ),
-        'CN26' => __( 'Shaanxi / 陕西', 'invoicing' ),
-        'CN27' => __( 'Gansu / 甘肃', 'invoicing' ),
-        'CN28' => __( 'Qinghai / 青海', 'invoicing' ),
-        'CN29' => __( 'Ningxia Hui / 宁夏', 'invoicing' ),
-        'CN30' => __( 'Macau / 澳门', 'invoicing' ),
-        'CN31' => __( 'Tibet / 西藏', 'invoicing' ),
-        'CN32' => __( 'Xinjiang / 新疆', 'invoicing' )
+        'CN1'  => __('Yunnan / 云南', 'invoicing'),
+        'CN2'  => __('Beijing / 北京', 'invoicing'),
+        'CN3'  => __('Tianjin / 天津', 'invoicing'),
+        'CN4'  => __('Hebei / 河北', 'invoicing'),
+        'CN5'  => __('Shanxi / 山西', 'invoicing'),
+        'CN6'  => __('Inner Mongolia / 內蒙古', 'invoicing'),
+        'CN7'  => __('Liaoning / 辽宁', 'invoicing'),
+        'CN8'  => __('Jilin / 吉林', 'invoicing'),
+        'CN9'  => __('Heilongjiang / 黑龙江', 'invoicing'),
+        'CN10' => __('Shanghai / 上海', 'invoicing'),
+        'CN11' => __('Jiangsu / 江苏', 'invoicing'),
+        'CN12' => __('Zhejiang / 浙江', 'invoicing'),
+        'CN13' => __('Anhui / 安徽', 'invoicing'),
+        'CN14' => __('Fujian / 福建', 'invoicing'),
+        'CN15' => __('Jiangxi / 江西', 'invoicing'),
+        'CN16' => __('Shandong / 山东', 'invoicing'),
+        'CN17' => __('Henan / 河南', 'invoicing'),
+        'CN18' => __('Hubei / 湖北', 'invoicing'),
+        'CN19' => __('Hunan / 湖南', 'invoicing'),
+        'CN20' => __('Guangdong / 广东', 'invoicing'),
+        'CN21' => __('Guangxi Zhuang / 广西壮族', 'invoicing'),
+        'CN22' => __('Hainan / 海南', 'invoicing'),
+        'CN23' => __('Chongqing / 重庆', 'invoicing'),
+        'CN24' => __('Sichuan / 四川', 'invoicing'),
+        'CN25' => __('Guizhou / 贵州', 'invoicing'),
+        'CN26' => __('Shaanxi / 陕西', 'invoicing'),
+        'CN27' => __('Gansu / 甘肃', 'invoicing'),
+        'CN28' => __('Qinghai / 青海', 'invoicing'),
+        'CN29' => __('Ningxia Hui / 宁夏', 'invoicing'),
+        'CN30' => __('Macau / 澳门', 'invoicing'),
+        'CN31' => __('Tibet / 西藏', 'invoicing'),
+        'CN32' => __('Xinjiang / 新疆', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_china_states', $states );
+    return apply_filters('wpinv_china_states', $states);
 }
 
 function wpinv_get_new_zealand_states_list() {
     $states = array(
-        'AK' => __( 'Auckland', 'invoicing' ),
-        'BP' => __( 'Bay of Plenty', 'invoicing' ),
-        'CT' => __( 'Canterbury', 'invoicing' ),
-        'HB' => __( 'Hawke’s Bay', 'invoicing' ),
-        'MW' => __( 'Manawatu-Wanganui', 'invoicing' ),
-        'MB' => __( 'Marlborough', 'invoicing' ),
-        'NS' => __( 'Nelson', 'invoicing' ),
-        'NL' => __( 'Northland', 'invoicing' ),
-        'OT' => __( 'Otago', 'invoicing' ),
-        'SL' => __( 'Southland', 'invoicing' ),
-        'TK' => __( 'Taranaki', 'invoicing' ),
-        'TM' => __( 'Tasman', 'invoicing' ),
-        'WA' => __( 'Waikato', 'invoicing' ),
-        'WR' => __( 'Wairarapa', 'invoicing' ),
-        'WE' => __( 'Wellington', 'invoicing' ),
-        'WC' => __( 'West Coast', 'invoicing' )
+        'AK' => __('Auckland', 'invoicing'),
+        'BP' => __('Bay of Plenty', 'invoicing'),
+        'CT' => __('Canterbury', 'invoicing'),
+        'HB' => __('Hawke’s Bay', 'invoicing'),
+        'MW' => __('Manawatu-Wanganui', 'invoicing'),
+        'MB' => __('Marlborough', 'invoicing'),
+        'NS' => __('Nelson', 'invoicing'),
+        'NL' => __('Northland', 'invoicing'),
+        'OT' => __('Otago', 'invoicing'),
+        'SL' => __('Southland', 'invoicing'),
+        'TK' => __('Taranaki', 'invoicing'),
+        'TM' => __('Tasman', 'invoicing'),
+        'WA' => __('Waikato', 'invoicing'),
+        'WR' => __('Wairarapa', 'invoicing'),
+        'WE' => __('Wellington', 'invoicing'),
+        'WC' => __('West Coast', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_new_zealand_states', $states );
+    return apply_filters('wpinv_new_zealand_states', $states);
 }
 
 function wpinv_get_peru_states_list() {
     $states = array(
-        'CAL' => __( 'El Callao', 'invoicing' ),
-        'LMA' => __( 'Municipalidad Metropolitana de Lima', 'invoicing' ),
-        'AMA' => __( 'Amazonas', 'invoicing' ),
-        'ANC' => __( 'Ancash', 'invoicing' ),
-        'APU' => __( 'Apurímac', 'invoicing' ),
-        'ARE' => __( 'Arequipa', 'invoicing' ),
-        'AYA' => __( 'Ayacucho', 'invoicing' ),
-        'CAJ' => __( 'Cajamarca', 'invoicing' ),
-        'CUS' => __( 'Cusco', 'invoicing' ),
-        'HUV' => __( 'Huancavelica', 'invoicing' ),
-        'HUC' => __( 'Huánuco', 'invoicing' ),
-        'ICA' => __( 'Ica', 'invoicing' ),
-        'JUN' => __( 'Junín', 'invoicing' ),
-        'LAL' => __( 'La Libertad', 'invoicing' ),
-        'LAM' => __( 'Lambayeque', 'invoicing' ),
-        'LIM' => __( 'Lima', 'invoicing' ),
-        'LOR' => __( 'Loreto', 'invoicing' ),
-        'MDD' => __( 'Madre de Dios', 'invoicing' ),
-        'MOQ' => __( 'Moquegua', 'invoicing' ),
-        'PAS' => __( 'Pasco', 'invoicing' ),
-        'PIU' => __( 'Piura', 'invoicing' ),
-        'PUN' => __( 'Puno', 'invoicing' ),
-        'SAM' => __( 'San Martín', 'invoicing' ),
-        'TAC' => __( 'Tacna', 'invoicing' ),
-        'TUM' => __( 'Tumbes', 'invoicing' ),
-        'UCA' => __( 'Ucayali', 'invoicing' )
+        'CAL' => __('El Callao', 'invoicing'),
+        'LMA' => __('Municipalidad Metropolitana de Lima', 'invoicing'),
+        'AMA' => __('Amazonas', 'invoicing'),
+        'ANC' => __('Ancash', 'invoicing'),
+        'APU' => __('Apurímac', 'invoicing'),
+        'ARE' => __('Arequipa', 'invoicing'),
+        'AYA' => __('Ayacucho', 'invoicing'),
+        'CAJ' => __('Cajamarca', 'invoicing'),
+        'CUS' => __('Cusco', 'invoicing'),
+        'HUV' => __('Huancavelica', 'invoicing'),
+        'HUC' => __('Huánuco', 'invoicing'),
+        'ICA' => __('Ica', 'invoicing'),
+        'JUN' => __('Junín', 'invoicing'),
+        'LAL' => __('La Libertad', 'invoicing'),
+        'LAM' => __('Lambayeque', 'invoicing'),
+        'LIM' => __('Lima', 'invoicing'),
+        'LOR' => __('Loreto', 'invoicing'),
+        'MDD' => __('Madre de Dios', 'invoicing'),
+        'MOQ' => __('Moquegua', 'invoicing'),
+        'PAS' => __('Pasco', 'invoicing'),
+        'PIU' => __('Piura', 'invoicing'),
+        'PUN' => __('Puno', 'invoicing'),
+        'SAM' => __('San Martín', 'invoicing'),
+        'TAC' => __('Tacna', 'invoicing'),
+        'TUM' => __('Tumbes', 'invoicing'),
+        'UCA' => __('Ucayali', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_peru_states', $states );
+    return apply_filters('wpinv_peru_states', $states);
 }
 
 function wpinv_get_indonesia_states_list() {
-    $states  = array(
-        'AC' => __( 'Daerah Istimewa Aceh', 'invoicing' ),
-        'SU' => __( 'Sumatera Utara', 'invoicing' ),
-        'SB' => __( 'Sumatera Barat', 'invoicing' ),
-        'RI' => __( 'Riau', 'invoicing' ),
-        'KR' => __( 'Kepulauan Riau', 'invoicing' ),
-        'JA' => __( 'Jambi', 'invoicing' ),
-        'SS' => __( 'Sumatera Selatan', 'invoicing' ),
-        'BB' => __( 'Bangka Belitung', 'invoicing' ),
-        'BE' => __( 'Bengkulu', 'invoicing' ),
-        'LA' => __( 'Lampung', 'invoicing' ),
-        'JK' => __( 'DKI Jakarta', 'invoicing' ),
-        'JB' => __( 'Jawa Barat', 'invoicing' ),
-        'BT' => __( 'Banten', 'invoicing' ),
-        'JT' => __( 'Jawa Tengah', 'invoicing' ),
-        'JI' => __( 'Jawa Timur', 'invoicing' ),
-        'YO' => __( 'Daerah Istimewa Yogyakarta', 'invoicing' ),
-        'BA' => __( 'Bali', 'invoicing' ),
-        'NB' => __( 'Nusa Tenggara Barat', 'invoicing' ),
-        'NT' => __( 'Nusa Tenggara Timur', 'invoicing' ),
-        'KB' => __( 'Kalimantan Barat', 'invoicing' ),
-        'KT' => __( 'Kalimantan Tengah', 'invoicing' ),
-        'KI' => __( 'Kalimantan Timur', 'invoicing' ),
-        'KS' => __( 'Kalimantan Selatan', 'invoicing' ),
-        'KU' => __( 'Kalimantan Utara', 'invoicing' ),
-        'SA' => __( 'Sulawesi Utara', 'invoicing' ),
-        'ST' => __( 'Sulawesi Tengah', 'invoicing' ),
-        'SG' => __( 'Sulawesi Tenggara', 'invoicing' ),
-        'SR' => __( 'Sulawesi Barat', 'invoicing' ),
-        'SN' => __( 'Sulawesi Selatan', 'invoicing' ),
-        'GO' => __( 'Gorontalo', 'invoicing' ),
-        'MA' => __( 'Maluku', 'invoicing' ),
-        'MU' => __( 'Maluku Utara', 'invoicing' ),
-        'PA' => __( 'Papua', 'invoicing' ),
-        'PB' => __( 'Papua Barat', 'invoicing' )
+    $states = array(
+        'AC' => __('Daerah Istimewa Aceh', 'invoicing'),
+        'SU' => __('Sumatera Utara', 'invoicing'),
+        'SB' => __('Sumatera Barat', 'invoicing'),
+        'RI' => __('Riau', 'invoicing'),
+        'KR' => __('Kepulauan Riau', 'invoicing'),
+        'JA' => __('Jambi', 'invoicing'),
+        'SS' => __('Sumatera Selatan', 'invoicing'),
+        'BB' => __('Bangka Belitung', 'invoicing'),
+        'BE' => __('Bengkulu', 'invoicing'),
+        'LA' => __('Lampung', 'invoicing'),
+        'JK' => __('DKI Jakarta', 'invoicing'),
+        'JB' => __('Jawa Barat', 'invoicing'),
+        'BT' => __('Banten', 'invoicing'),
+        'JT' => __('Jawa Tengah', 'invoicing'),
+        'JI' => __('Jawa Timur', 'invoicing'),
+        'YO' => __('Daerah Istimewa Yogyakarta', 'invoicing'),
+        'BA' => __('Bali', 'invoicing'),
+        'NB' => __('Nusa Tenggara Barat', 'invoicing'),
+        'NT' => __('Nusa Tenggara Timur', 'invoicing'),
+        'KB' => __('Kalimantan Barat', 'invoicing'),
+        'KT' => __('Kalimantan Tengah', 'invoicing'),
+        'KI' => __('Kalimantan Timur', 'invoicing'),
+        'KS' => __('Kalimantan Selatan', 'invoicing'),
+        'KU' => __('Kalimantan Utara', 'invoicing'),
+        'SA' => __('Sulawesi Utara', 'invoicing'),
+        'ST' => __('Sulawesi Tengah', 'invoicing'),
+        'SG' => __('Sulawesi Tenggara', 'invoicing'),
+        'SR' => __('Sulawesi Barat', 'invoicing'),
+        'SN' => __('Sulawesi Selatan', 'invoicing'),
+        'GO' => __('Gorontalo', 'invoicing'),
+        'MA' => __('Maluku', 'invoicing'),
+        'MU' => __('Maluku Utara', 'invoicing'),
+        'PA' => __('Papua', 'invoicing'),
+        'PB' => __('Papua Barat', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_indonesia_states', $states );
+    return apply_filters('wpinv_indonesia_states', $states);
 }
 
 function wpinv_get_india_states_list() {
     $states = array(
-        'AP' => __( 'Andhra Pradesh', 'invoicing' ),
-        'AR' => __( 'Arunachal Pradesh', 'invoicing' ),
-        'AS' => __( 'Assam', 'invoicing' ),
-        'BR' => __( 'Bihar', 'invoicing' ),
-        'CT' => __( 'Chhattisgarh', 'invoicing' ),
-        'GA' => __( 'Goa', 'invoicing' ),
-        'GJ' => __( 'Gujarat', 'invoicing' ),
-        'HR' => __( 'Haryana', 'invoicing' ),
-        'HP' => __( 'Himachal Pradesh', 'invoicing' ),
-        'JK' => __( 'Jammu and Kashmir', 'invoicing' ),
-        'JH' => __( 'Jharkhand', 'invoicing' ),
-        'KA' => __( 'Karnataka', 'invoicing' ),
-        'KL' => __( 'Kerala', 'invoicing' ),
-        'MP' => __( 'Madhya Pradesh', 'invoicing' ),
-        'MH' => __( 'Maharashtra', 'invoicing' ),
-        'MN' => __( 'Manipur', 'invoicing' ),
-        'ML' => __( 'Meghalaya', 'invoicing' ),
-        'MZ' => __( 'Mizoram', 'invoicing' ),
-        'NL' => __( 'Nagaland', 'invoicing' ),
-        'OR' => __( 'Orissa', 'invoicing' ),
-        'PB' => __( 'Punjab', 'invoicing' ),
-        'RJ' => __( 'Rajasthan', 'invoicing' ),
-        'SK' => __( 'Sikkim', 'invoicing' ),
-        'TN' => __( 'Tamil Nadu', 'invoicing' ),
-        'TG' => __( 'Telangana', 'invoicing' ),
-        'TR' => __( 'Tripura', 'invoicing' ),
-        'UT' => __( 'Uttarakhand', 'invoicing' ),
-        'UP' => __( 'Uttar Pradesh', 'invoicing' ),
-        'WB' => __( 'West Bengal', 'invoicing' ),
-        'AN' => __( 'Andaman and Nicobar Islands', 'invoicing' ),
-        'CH' => __( 'Chandigarh', 'invoicing' ),
-        'DN' => __( 'Dadar and Nagar Haveli', 'invoicing' ),
-        'DD' => __( 'Daman and Diu', 'invoicing' ),
-        'DL' => __( 'Delhi', 'invoicing' ),
-        'LD' => __( 'Lakshadweep', 'invoicing' ),
-        'PY' => __( 'Pondicherry (Puducherry)', 'invoicing' )
+        'AP' => __('Andhra Pradesh', 'invoicing'),
+        'AR' => __('Arunachal Pradesh', 'invoicing'),
+        'AS' => __('Assam', 'invoicing'),
+        'BR' => __('Bihar', 'invoicing'),
+        'CT' => __('Chhattisgarh', 'invoicing'),
+        'GA' => __('Goa', 'invoicing'),
+        'GJ' => __('Gujarat', 'invoicing'),
+        'HR' => __('Haryana', 'invoicing'),
+        'HP' => __('Himachal Pradesh', 'invoicing'),
+        'JK' => __('Jammu and Kashmir', 'invoicing'),
+        'JH' => __('Jharkhand', 'invoicing'),
+        'KA' => __('Karnataka', 'invoicing'),
+        'KL' => __('Kerala', 'invoicing'),
+        'MP' => __('Madhya Pradesh', 'invoicing'),
+        'MH' => __('Maharashtra', 'invoicing'),
+        'MN' => __('Manipur', 'invoicing'),
+        'ML' => __('Meghalaya', 'invoicing'),
+        'MZ' => __('Mizoram', 'invoicing'),
+        'NL' => __('Nagaland', 'invoicing'),
+        'OR' => __('Orissa', 'invoicing'),
+        'PB' => __('Punjab', 'invoicing'),
+        'RJ' => __('Rajasthan', 'invoicing'),
+        'SK' => __('Sikkim', 'invoicing'),
+        'TN' => __('Tamil Nadu', 'invoicing'),
+        'TG' => __('Telangana', 'invoicing'),
+        'TR' => __('Tripura', 'invoicing'),
+        'UT' => __('Uttarakhand', 'invoicing'),
+        'UP' => __('Uttar Pradesh', 'invoicing'),
+        'WB' => __('West Bengal', 'invoicing'),
+        'AN' => __('Andaman and Nicobar Islands', 'invoicing'),
+        'CH' => __('Chandigarh', 'invoicing'),
+        'DN' => __('Dadar and Nagar Haveli', 'invoicing'),
+        'DD' => __('Daman and Diu', 'invoicing'),
+        'DL' => __('Delhi', 'invoicing'),
+        'LD' => __('Lakshadweep', 'invoicing'),
+        'PY' => __('Pondicherry (Puducherry)', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_india_states', $states );
+    return apply_filters('wpinv_india_states', $states);
 }
 
 function wpinv_get_iran_states_list() {
     $states = array(
-        'KHZ' => __( 'Khuzestan', 'invoicing' ),
-        'THR' => __( 'Tehran', 'invoicing' ),
-        'ILM' => __( 'Ilaam', 'invoicing' ),
-        'BHR' => __( 'Bushehr', 'invoicing' ),
-        'ADL' => __( 'Ardabil', 'invoicing' ),
-        'ESF' => __( 'Isfahan', 'invoicing' ),
-        'YZD' => __( 'Yazd', 'invoicing' ),
-        'KRH' => __( 'Kermanshah', 'invoicing' ),
-        'KRN' => __( 'Kerman', 'invoicing' ),
-        'HDN' => __( 'Hamadan', 'invoicing' ),
-        'GZN' => __( 'Ghazvin', 'invoicing' ),
-        'ZJN' => __( 'Zanjan', 'invoicing' ),
-        'LRS' => __( 'Luristan', 'invoicing' ),
-        'ABZ' => __( 'Alborz', 'invoicing' ),
-        'EAZ' => __( 'East Azerbaijan', 'invoicing' ),
-        'WAZ' => __( 'West Azerbaijan', 'invoicing' ),
-        'CHB' => __( 'Chaharmahal and Bakhtiari', 'invoicing' ),
-        'SKH' => __( 'South Khorasan', 'invoicing' ),
-        'RKH' => __( 'Razavi Khorasan', 'invoicing' ),
-        'NKH' => __( 'North Khorasan', 'invoicing' ),
-        'SMN' => __( 'Semnan', 'invoicing' ),
-        'FRS' => __( 'Fars', 'invoicing' ),
-        'QHM' => __( 'Qom', 'invoicing' ),
-        'KRD' => __( 'Kurdistan', 'invoicing' ),
-        'KBD' => __( 'Kohgiluyeh and BoyerAhmad', 'invoicing' ),
-        'GLS' => __( 'Golestan', 'invoicing' ),
-        'GIL' => __( 'Gilan', 'invoicing' ),
-        'MZN' => __( 'Mazandaran', 'invoicing' ),
-        'MKZ' => __( 'Markazi', 'invoicing' ),
-        'HRZ' => __( 'Hormozgan', 'invoicing' ),
-        'SBN' => __( 'Sistan and Baluchestan', 'invoicing' )
+        'KHZ' => __('Khuzestan', 'invoicing'),
+        'THR' => __('Tehran', 'invoicing'),
+        'ILM' => __('Ilaam', 'invoicing'),
+        'BHR' => __('Bushehr', 'invoicing'),
+        'ADL' => __('Ardabil', 'invoicing'),
+        'ESF' => __('Isfahan', 'invoicing'),
+        'YZD' => __('Yazd', 'invoicing'),
+        'KRH' => __('Kermanshah', 'invoicing'),
+        'KRN' => __('Kerman', 'invoicing'),
+        'HDN' => __('Hamadan', 'invoicing'),
+        'GZN' => __('Ghazvin', 'invoicing'),
+        'ZJN' => __('Zanjan', 'invoicing'),
+        'LRS' => __('Luristan', 'invoicing'),
+        'ABZ' => __('Alborz', 'invoicing'),
+        'EAZ' => __('East Azerbaijan', 'invoicing'),
+        'WAZ' => __('West Azerbaijan', 'invoicing'),
+        'CHB' => __('Chaharmahal and Bakhtiari', 'invoicing'),
+        'SKH' => __('South Khorasan', 'invoicing'),
+        'RKH' => __('Razavi Khorasan', 'invoicing'),
+        'NKH' => __('North Khorasan', 'invoicing'),
+        'SMN' => __('Semnan', 'invoicing'),
+        'FRS' => __('Fars', 'invoicing'),
+        'QHM' => __('Qom', 'invoicing'),
+        'KRD' => __('Kurdistan', 'invoicing'),
+        'KBD' => __('Kohgiluyeh and BoyerAhmad', 'invoicing'),
+        'GLS' => __('Golestan', 'invoicing'),
+        'GIL' => __('Gilan', 'invoicing'),
+        'MZN' => __('Mazandaran', 'invoicing'),
+        'MKZ' => __('Markazi', 'invoicing'),
+        'HRZ' => __('Hormozgan', 'invoicing'),
+        'SBN' => __('Sistan and Baluchestan', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_iran_states', $states );
+    return apply_filters('wpinv_iran_states', $states);
 }
 
 function wpinv_get_italy_states_list() {
     $states = array(
-        'AG' => __( 'Agrigento', 'invoicing' ),
-        'AL' => __( 'Alessandria', 'invoicing' ),
-        'AN' => __( 'Ancona', 'invoicing' ),
-        'AO' => __( 'Aosta', 'invoicing' ),
-        'AR' => __( 'Arezzo', 'invoicing' ),
-        'AP' => __( 'Ascoli Piceno', 'invoicing' ),
-        'AT' => __( 'Asti', 'invoicing' ),
-        'AV' => __( 'Avellino', 'invoicing' ),
-        'BA' => __( 'Bari', 'invoicing' ),
-        'BT' => __( 'Barletta-Andria-Trani', 'invoicing' ),
-        'BL' => __( 'Belluno', 'invoicing' ),
-        'BN' => __( 'Benevento', 'invoicing' ),
-        'BG' => __( 'Bergamo', 'invoicing' ),
-        'BI' => __( 'Biella', 'invoicing' ),
-        'BO' => __( 'Bologna', 'invoicing' ),
-        'BZ' => __( 'Bolzano', 'invoicing' ),
-        'BS' => __( 'Brescia', 'invoicing' ),
-        'BR' => __( 'Brindisi', 'invoicing' ),
-        'CA' => __( 'Cagliari', 'invoicing' ),
-        'CL' => __( 'Caltanissetta', 'invoicing' ),
-        'CB' => __( 'Campobasso', 'invoicing' ),
-        'CI' => __( 'Caltanissetta', 'invoicing' ),
-        'CE' => __( 'Caserta', 'invoicing' ),
-        'CT' => __( 'Catania', 'invoicing' ),
-        'CZ' => __( 'Catanzaro', 'invoicing' ),
-        'CH' => __( 'Chieti', 'invoicing' ),
-        'CO' => __( 'Como', 'invoicing' ),
-        'CS' => __( 'Cosenza', 'invoicing' ),
-        'CR' => __( 'Cremona', 'invoicing' ),
-        'KR' => __( 'Crotone', 'invoicing' ),
-        'CN' => __( 'Cuneo', 'invoicing' ),
-        'EN' => __( 'Enna', 'invoicing' ),
-        'FM' => __( 'Fermo', 'invoicing' ),
-        'FE' => __( 'Ferrara', 'invoicing' ),
-        'FI' => __( 'Firenze', 'invoicing' ),
-        'FG' => __( 'Foggia', 'invoicing' ),
-        'FC' => __( 'Forli-Cesena', 'invoicing' ),
-        'FR' => __( 'Frosinone', 'invoicing' ),
-        'GE' => __( 'Genova', 'invoicing' ),
-        'GO' => __( 'Gorizia', 'invoicing' ),
-        'GR' => __( 'Grosseto', 'invoicing' ),
-        'IM' => __( 'Imperia', 'invoicing' ),
-        'IS' => __( 'Isernia', 'invoicing' ),
-        'SP' => __( 'La Spezia', 'invoicing' ),
-        'AQ' => __( 'L'Aquila', 'invoicing' ),
-        'LT' => __( 'Latina', 'invoicing' ),
-        'LE' => __( 'Lecce', 'invoicing' ),
-        'LC' => __( 'Lecco', 'invoicing' ),
-        'LI' => __( 'Livorno', 'invoicing' ),
-        'LO' => __( 'Lodi', 'invoicing' ),
-        'LU' => __( 'Lucca', 'invoicing' ),
-        'MC' => __( 'Macerata', 'invoicing' ),
-        'MN' => __( 'Mantova', 'invoicing' ),
-        'MS' => __( 'Massa-Carrara', 'invoicing' ),
-        'MT' => __( 'Matera', 'invoicing' ),
-        'ME' => __( 'Messina', 'invoicing' ),
-        'MI' => __( 'Milano', 'invoicing' ),
-        'MO' => __( 'Modena', 'invoicing' ),
-        'MB' => __( 'Monza e della Brianza', 'invoicing' ),
-        'NA' => __( 'Napoli', 'invoicing' ),
-        'NO' => __( 'Novara', 'invoicing' ),
-        'NU' => __( 'Nuoro', 'invoicing' ),
-        'OT' => __( 'Olbia-Tempio', 'invoicing' ),
-        'OR' => __( 'Oristano', 'invoicing' ),
-        'PD' => __( 'Padova', 'invoicing' ),
-        'PA' => __( 'Palermo', 'invoicing' ),
-        'PR' => __( 'Parma', 'invoicing' ),
-        'PV' => __( 'Pavia', 'invoicing' ),
-        'PG' => __( 'Perugia', 'invoicing' ),
-        'PU' => __( 'Pesaro e Urbino', 'invoicing' ),
-        'PE' => __( 'Pescara', 'invoicing' ),
-        'PC' => __( 'Piacenza', 'invoicing' ),
-        'PI' => __( 'Pisa', 'invoicing' ),
-        'PT' => __( 'Pistoia', 'invoicing' ),
-        'PN' => __( 'Pordenone', 'invoicing' ),
-        'PZ' => __( 'Potenza', 'invoicing' ),
-        'PO' => __( 'Prato', 'invoicing' ),
-        'RG' => __( 'Ragusa', 'invoicing' ),
-        'RA' => __( 'Ravenna', 'invoicing' ),
-        'RC' => __( 'Reggio Calabria', 'invoicing' ),
-        'RE' => __( 'Reggio Emilia', 'invoicing' ),
-        'RI' => __( 'Rieti', 'invoicing' ),
-        'RN' => __( 'Rimini', 'invoicing' ),
-        'RM' => __( 'Roma', 'invoicing' ),
-        'RO' => __( 'Rovigo', 'invoicing' ),
-        'SA' => __( 'Salerno', 'invoicing' ),
-        'VS' => __( 'Medio Campidano', 'invoicing' ),
-        'SS' => __( 'Sassari', 'invoicing' ),
-        'SV' => __( 'Savona', 'invoicing' ),
-        'SI' => __( 'Siena', 'invoicing' ),
-        'SR' => __( 'Siracusa', 'invoicing' ),
-        'SO' => __( 'Sondrio', 'invoicing' ),
-        'TA' => __( 'Taranto', 'invoicing' ),
-        'TE' => __( 'Teramo', 'invoicing' ),
-        'TR' => __( 'Terni', 'invoicing' ),
-        'TO' => __( 'Torino', 'invoicing' ),
-        'OG' => __( 'Ogliastra', 'invoicing' ),
-        'TP' => __( 'Trapani', 'invoicing' ),
-        'TN' => __( 'Trento', 'invoicing' ),
-        'TV' => __( 'Treviso', 'invoicing' ),
-        'TS' => __( 'Trieste', 'invoicing' ),
-        'UD' => __( 'Udine', 'invoicing' ),
-        'VA' => __( 'Varesa', 'invoicing' ),
-        'VE' => __( 'Venezia', 'invoicing' ),
-        'VB' => __( 'Verbano-Cusio-Ossola', 'invoicing' ),
-        'VC' => __( 'Vercelli', 'invoicing' ),
-        'VR' => __( 'Verona', 'invoicing' ),
-        'VV' => __( 'Vibo Valentia', 'invoicing' ),
-        'VI' => __( 'Vicenza', 'invoicing' ),
-        'VT' => __( 'Viterbo', 'invoicing' )
+        'AG' => __('Agrigento', 'invoicing'),
+        'AL' => __('Alessandria', 'invoicing'),
+        'AN' => __('Ancona', 'invoicing'),
+        'AO' => __('Aosta', 'invoicing'),
+        'AR' => __('Arezzo', 'invoicing'),
+        'AP' => __('Ascoli Piceno', 'invoicing'),
+        'AT' => __('Asti', 'invoicing'),
+        'AV' => __('Avellino', 'invoicing'),
+        'BA' => __('Bari', 'invoicing'),
+        'BT' => __('Barletta-Andria-Trani', 'invoicing'),
+        'BL' => __('Belluno', 'invoicing'),
+        'BN' => __('Benevento', 'invoicing'),
+        'BG' => __('Bergamo', 'invoicing'),
+        'BI' => __('Biella', 'invoicing'),
+        'BO' => __('Bologna', 'invoicing'),
+        'BZ' => __('Bolzano', 'invoicing'),
+        'BS' => __('Brescia', 'invoicing'),
+        'BR' => __('Brindisi', 'invoicing'),
+        'CA' => __('Cagliari', 'invoicing'),
+        'CL' => __('Caltanissetta', 'invoicing'),
+        'CB' => __('Campobasso', 'invoicing'),
+        'CI' => __('Caltanissetta', 'invoicing'),
+        'CE' => __('Caserta', 'invoicing'),
+        'CT' => __('Catania', 'invoicing'),
+        'CZ' => __('Catanzaro', 'invoicing'),
+        'CH' => __('Chieti', 'invoicing'),
+        'CO' => __('Como', 'invoicing'),
+        'CS' => __('Cosenza', 'invoicing'),
+        'CR' => __('Cremona', 'invoicing'),
+        'KR' => __('Crotone', 'invoicing'),
+        'CN' => __('Cuneo', 'invoicing'),
+        'EN' => __('Enna', 'invoicing'),
+        'FM' => __('Fermo', 'invoicing'),
+        'FE' => __('Ferrara', 'invoicing'),
+        'FI' => __('Firenze', 'invoicing'),
+        'FG' => __('Foggia', 'invoicing'),
+        'FC' => __('Forli-Cesena', 'invoicing'),
+        'FR' => __('Frosinone', 'invoicing'),
+        'GE' => __('Genova', 'invoicing'),
+        'GO' => __('Gorizia', 'invoicing'),
+        'GR' => __('Grosseto', 'invoicing'),
+        'IM' => __('Imperia', 'invoicing'),
+        'IS' => __('Isernia', 'invoicing'),
+        'SP' => __('La Spezia', 'invoicing'),
+        'AQ' => __('L'Aquila', 'invoicing'),
+        'LT' => __('Latina', 'invoicing'),
+        'LE' => __('Lecce', 'invoicing'),
+        'LC' => __('Lecco', 'invoicing'),
+        'LI' => __('Livorno', 'invoicing'),
+        'LO' => __('Lodi', 'invoicing'),
+        'LU' => __('Lucca', 'invoicing'),
+        'MC' => __('Macerata', 'invoicing'),
+        'MN' => __('Mantova', 'invoicing'),
+        'MS' => __('Massa-Carrara', 'invoicing'),
+        'MT' => __('Matera', 'invoicing'),
+        'ME' => __('Messina', 'invoicing'),
+        'MI' => __('Milano', 'invoicing'),
+        'MO' => __('Modena', 'invoicing'),
+        'MB' => __('Monza e della Brianza', 'invoicing'),
+        'NA' => __('Napoli', 'invoicing'),
+        'NO' => __('Novara', 'invoicing'),
+        'NU' => __('Nuoro', 'invoicing'),
+        'OT' => __('Olbia-Tempio', 'invoicing'),
+        'OR' => __('Oristano', 'invoicing'),
+        'PD' => __('Padova', 'invoicing'),
+        'PA' => __('Palermo', 'invoicing'),
+        'PR' => __('Parma', 'invoicing'),
+        'PV' => __('Pavia', 'invoicing'),
+        'PG' => __('Perugia', 'invoicing'),
+        'PU' => __('Pesaro e Urbino', 'invoicing'),
+        'PE' => __('Pescara', 'invoicing'),
+        'PC' => __('Piacenza', 'invoicing'),
+        'PI' => __('Pisa', 'invoicing'),
+        'PT' => __('Pistoia', 'invoicing'),
+        'PN' => __('Pordenone', 'invoicing'),
+        'PZ' => __('Potenza', 'invoicing'),
+        'PO' => __('Prato', 'invoicing'),
+        'RG' => __('Ragusa', 'invoicing'),
+        'RA' => __('Ravenna', 'invoicing'),
+        'RC' => __('Reggio Calabria', 'invoicing'),
+        'RE' => __('Reggio Emilia', 'invoicing'),
+        'RI' => __('Rieti', 'invoicing'),
+        'RN' => __('Rimini', 'invoicing'),
+        'RM' => __('Roma', 'invoicing'),
+        'RO' => __('Rovigo', 'invoicing'),
+        'SA' => __('Salerno', 'invoicing'),
+        'VS' => __('Medio Campidano', 'invoicing'),
+        'SS' => __('Sassari', 'invoicing'),
+        'SV' => __('Savona', 'invoicing'),
+        'SI' => __('Siena', 'invoicing'),
+        'SR' => __('Siracusa', 'invoicing'),
+        'SO' => __('Sondrio', 'invoicing'),
+        'TA' => __('Taranto', 'invoicing'),
+        'TE' => __('Teramo', 'invoicing'),
+        'TR' => __('Terni', 'invoicing'),
+        'TO' => __('Torino', 'invoicing'),
+        'OG' => __('Ogliastra', 'invoicing'),
+        'TP' => __('Trapani', 'invoicing'),
+        'TN' => __('Trento', 'invoicing'),
+        'TV' => __('Treviso', 'invoicing'),
+        'TS' => __('Trieste', 'invoicing'),
+        'UD' => __('Udine', 'invoicing'),
+        'VA' => __('Varesa', 'invoicing'),
+        'VE' => __('Venezia', 'invoicing'),
+        'VB' => __('Verbano-Cusio-Ossola', 'invoicing'),
+        'VC' => __('Vercelli', 'invoicing'),
+        'VR' => __('Verona', 'invoicing'),
+        'VV' => __('Vibo Valentia', 'invoicing'),
+        'VI' => __('Vicenza', 'invoicing'),
+        'VT' => __('Viterbo', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_italy_states', $states );
+    return apply_filters('wpinv_italy_states', $states);
 }
 
 function wpinv_get_malaysia_states_list() {
     $states = array(
-        'JHR' => __( 'Johor', 'invoicing' ),
-        'KDH' => __( 'Kedah', 'invoicing' ),
-        'KTN' => __( 'Kelantan', 'invoicing' ),
-        'MLK' => __( 'Melaka', 'invoicing' ),
-        'NSN' => __( 'Negeri Sembilan', 'invoicing' ),
-        'PHG' => __( 'Pahang', 'invoicing' ),
-        'PRK' => __( 'Perak', 'invoicing' ),
-        'PLS' => __( 'Perlis', 'invoicing' ),
-        'PNG' => __( 'Pulau Pinang', 'invoicing' ),
-        'SBH' => __( 'Sabah', 'invoicing' ),
-        'SWK' => __( 'Sarawak', 'invoicing' ),
-        'SGR' => __( 'Selangor', 'invoicing' ),
-        'TRG' => __( 'Terengganu', 'invoicing' ),
-        'KUL' => __( 'W.P. Kuala Lumpur', 'invoicing' ),
-        'LBN' => __( 'W.P. Labuan', 'invoicing' ),
-        'PJY' => __( 'W.P. Putrajaya', 'invoicing' )
+        'JHR' => __('Johor', 'invoicing'),
+        'KDH' => __('Kedah', 'invoicing'),
+        'KTN' => __('Kelantan', 'invoicing'),
+        'MLK' => __('Melaka', 'invoicing'),
+        'NSN' => __('Negeri Sembilan', 'invoicing'),
+        'PHG' => __('Pahang', 'invoicing'),
+        'PRK' => __('Perak', 'invoicing'),
+        'PLS' => __('Perlis', 'invoicing'),
+        'PNG' => __('Pulau Pinang', 'invoicing'),
+        'SBH' => __('Sabah', 'invoicing'),
+        'SWK' => __('Sarawak', 'invoicing'),
+        'SGR' => __('Selangor', 'invoicing'),
+        'TRG' => __('Terengganu', 'invoicing'),
+        'KUL' => __('W.P. Kuala Lumpur', 'invoicing'),
+        'LBN' => __('W.P. Labuan', 'invoicing'),
+        'PJY' => __('W.P. Putrajaya', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_malaysia_states', $states );
+    return apply_filters('wpinv_malaysia_states', $states);
 }
 
 function wpinv_get_mexico_states_list() {
     $states = array(
-        'DIF' => __( 'Distrito Federal', 'invoicing' ),
-        'JAL' => __( 'Jalisco', 'invoicing' ),
-        'NLE' => __( 'Nuevo León', 'invoicing' ),
-        'AGU' => __( 'Aguascalientes', 'invoicing' ),
-        'BCN' => __( 'Baja California Norte', 'invoicing' ),
-        'BCS' => __( 'Baja California Sur', 'invoicing' ),
-        'CAM' => __( 'Campeche', 'invoicing' ),
-        'CHP' => __( 'Chiapas', 'invoicing' ),
-        'CHH' => __( 'Chihuahua', 'invoicing' ),
-        'COA' => __( 'Coahuila', 'invoicing' ),
-        'COL' => __( 'Colima', 'invoicing' ),
-        'DUR' => __( 'Durango', 'invoicing' ),
-        'GUA' => __( 'Guanajuato', 'invoicing' ),
-        'GRO' => __( 'Guerrero', 'invoicing' ),
-        'HID' => __( 'Hidalgo', 'invoicing' ),
-        'MEX' => __( 'Edo. de México', 'invoicing' ),
-        'MIC' => __( 'Michoacán', 'invoicing' ),
-        'MOR' => __( 'Morelos', 'invoicing' ),
-        'NAY' => __( 'Nayarit', 'invoicing' ),
-        'OAX' => __( 'Oaxaca', 'invoicing' ),
-        'PUE' => __( 'Puebla', 'invoicing' ),
-        'QUE' => __( 'Querétaro', 'invoicing' ),
-        'ROO' => __( 'Quintana Roo', 'invoicing' ),
-        'SLP' => __( 'San Luis Potosí', 'invoicing' ),
-        'SIN' => __( 'Sinaloa', 'invoicing' ),
-        'SON' => __( 'Sonora', 'invoicing' ),
-        'TAB' => __( 'Tabasco', 'invoicing' ),
-        'TAM' => __( 'Tamaulipas', 'invoicing' ),
-        'TLA' => __( 'Tlaxcala', 'invoicing' ),
-        'VER' => __( 'Veracruz', 'invoicing' ),
-        'YUC' => __( 'Yucatán', 'invoicing' ),
-        'ZAC' => __( 'Zacatecas', 'invoicing' )
+        'DIF' => __('Distrito Federal', 'invoicing'),
+        'JAL' => __('Jalisco', 'invoicing'),
+        'NLE' => __('Nuevo León', 'invoicing'),
+        'AGU' => __('Aguascalientes', 'invoicing'),
+        'BCN' => __('Baja California Norte', 'invoicing'),
+        'BCS' => __('Baja California Sur', 'invoicing'),
+        'CAM' => __('Campeche', 'invoicing'),
+        'CHP' => __('Chiapas', 'invoicing'),
+        'CHH' => __('Chihuahua', 'invoicing'),
+        'COA' => __('Coahuila', 'invoicing'),
+        'COL' => __('Colima', 'invoicing'),
+        'DUR' => __('Durango', 'invoicing'),
+        'GUA' => __('Guanajuato', 'invoicing'),
+        'GRO' => __('Guerrero', 'invoicing'),
+        'HID' => __('Hidalgo', 'invoicing'),
+        'MEX' => __('Edo. de México', 'invoicing'),
+        'MIC' => __('Michoacán', 'invoicing'),
+        'MOR' => __('Morelos', 'invoicing'),
+        'NAY' => __('Nayarit', 'invoicing'),
+        'OAX' => __('Oaxaca', 'invoicing'),
+        'PUE' => __('Puebla', 'invoicing'),
+        'QUE' => __('Querétaro', 'invoicing'),
+        'ROO' => __('Quintana Roo', 'invoicing'),
+        'SLP' => __('San Luis Potosí', 'invoicing'),
+        'SIN' => __('Sinaloa', 'invoicing'),
+        'SON' => __('Sonora', 'invoicing'),
+        'TAB' => __('Tabasco', 'invoicing'),
+        'TAM' => __('Tamaulipas', 'invoicing'),
+        'TLA' => __('Tlaxcala', 'invoicing'),
+        'VER' => __('Veracruz', 'invoicing'),
+        'YUC' => __('Yucatán', 'invoicing'),
+        'ZAC' => __('Zacatecas', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_mexico_states', $states );
+    return apply_filters('wpinv_mexico_states', $states);
 }
 
 function wpinv_get_nepal_states_list() {
     $states = array(
-        'ILL' => __( 'Illam', 'invoicing' ),
-        'JHA' => __( 'Jhapa', 'invoicing' ),
-        'PAN' => __( 'Panchthar', 'invoicing' ),
-        'TAP' => __( 'Taplejung', 'invoicing' ),
-        'BHO' => __( 'Bhojpur', 'invoicing' ),
-        'DKA' => __( 'Dhankuta', 'invoicing' ),
-        'MOR' => __( 'Morang', 'invoicing' ),
-        'SUN' => __( 'Sunsari', 'invoicing' ),
-        'SAN' => __( 'Sankhuwa', 'invoicing' ),
-        'TER' => __( 'Terhathum', 'invoicing' ),
-        'KHO' => __( 'Khotang', 'invoicing' ),
-        'OKH' => __( 'Okhaldhunga', 'invoicing' ),
-        'SAP' => __( 'Saptari', 'invoicing' ),
-        'SIR' => __( 'Siraha', 'invoicing' ),
-        'SOL' => __( 'Solukhumbu', 'invoicing' ),
-        'UDA' => __( 'Udayapur', 'invoicing' ),
-        'DHA' => __( 'Dhanusa', 'invoicing' ),
-        'DLK' => __( 'Dolakha', 'invoicing' ),
-        'MOH' => __( 'Mohottari', 'invoicing' ),
-        'RAM' => __( 'Ramechha', 'invoicing' ),
-        'SAR' => __( 'Sarlahi', 'invoicing' ),
-        'SIN' => __( 'Sindhuli', 'invoicing' ),
-        'BHA' => __( 'Bhaktapur', 'invoicing' ),
-        'DHD' => __( 'Dhading', 'invoicing' ),
-        'KTM' => __( 'Kathmandu', 'invoicing' ),
-        'KAV' => __( 'Kavrepalanchowk', 'invoicing' ),
-        'LAL' => __( 'Lalitpur', 'invoicing' ),
-        'NUW' => __( 'Nuwakot', 'invoicing' ),
-        'RAS' => __( 'Rasuwa', 'invoicing' ),
-        'SPC' => __( 'Sindhupalchowk', 'invoicing' ),
-        'BAR' => __( 'Bara', 'invoicing' ),
-        'CHI' => __( 'Chitwan', 'invoicing' ),
-        'MAK' => __( 'Makwanpur', 'invoicing' ),
-        'PAR' => __( 'Parsa', 'invoicing' ),
-        'RAU' => __( 'Rautahat', 'invoicing' ),
-        'GOR' => __( 'Gorkha', 'invoicing' ),
-        'KAS' => __( 'Kaski', 'invoicing' ),
-        'LAM' => __( 'Lamjung', 'invoicing' ),
-        'MAN' => __( 'Manang', 'invoicing' ),
-        'SYN' => __( 'Syangja', 'invoicing' ),
-        'TAN' => __( 'Tanahun', 'invoicing' ),
-        'BAG' => __( 'Baglung', 'invoicing' ),
-        'PBT' => __( 'Parbat', 'invoicing' ),
-        'MUS' => __( 'Mustang', 'invoicing' ),
-        'MYG' => __( 'Myagdi', 'invoicing' ),
-        'AGR' => __( 'Agrghakanchi', 'invoicing' ),
-        'GUL' => __( 'Gulmi', 'invoicing' ),
-        'KAP' => __( 'Kapilbastu', 'invoicing' ),
-        'NAW' => __( 'Nawalparasi', 'invoicing' ),
-        'PAL' => __( 'Palpa', 'invoicing' ),
-        'RUP' => __( 'Rupandehi', 'invoicing' ),
-        'DAN' => __( 'Dang', 'invoicing' ),
-        'PYU' => __( 'Pyuthan', 'invoicing' ),
-        'ROL' => __( 'Rolpa', 'invoicing' ),
-        'RUK' => __( 'Rukum', 'invoicing' ),
-        'SAL' => __( 'Salyan', 'invoicing' ),
-        'BAN' => __( 'Banke', 'invoicing' ),
-        'BDA' => __( 'Bardiya', 'invoicing' ),
-        'DAI' => __( 'Dailekh', 'invoicing' ),
-        'JAJ' => __( 'Jajarkot', 'invoicing' ),
-        'SUR' => __( 'Surkhet', 'invoicing' ),
-        'DOL' => __( 'Dolpa', 'invoicing' ),
-        'HUM' => __( 'Humla', 'invoicing' ),
-        'JUM' => __( 'Jumla', 'invoicing' ),
-        'KAL' => __( 'Kalikot', 'invoicing' ),
-        'MUG' => __( 'Mugu', 'invoicing' ),
-        'ACH' => __( 'Achham', 'invoicing' ),
-        'BJH' => __( 'Bajhang', 'invoicing' ),
-        'BJU' => __( 'Bajura', 'invoicing' ),
-        'DOT' => __( 'Doti', 'invoicing' ),
-        'KAI' => __( 'Kailali', 'invoicing' ),
-        'BAI' => __( 'Baitadi', 'invoicing' ),
-        'DAD' => __( 'Dadeldhura', 'invoicing' ),
-        'DAR' => __( 'Darchula', 'invoicing' ),
-        'KAN' => __( 'Kanchanpur', 'invoicing' )
+        'ILL' => __('Illam', 'invoicing'),
+        'JHA' => __('Jhapa', 'invoicing'),
+        'PAN' => __('Panchthar', 'invoicing'),
+        'TAP' => __('Taplejung', 'invoicing'),
+        'BHO' => __('Bhojpur', 'invoicing'),
+        'DKA' => __('Dhankuta', 'invoicing'),
+        'MOR' => __('Morang', 'invoicing'),
+        'SUN' => __('Sunsari', 'invoicing'),
+        'SAN' => __('Sankhuwa', 'invoicing'),
+        'TER' => __('Terhathum', 'invoicing'),
+        'KHO' => __('Khotang', 'invoicing'),
+        'OKH' => __('Okhaldhunga', 'invoicing'),
+        'SAP' => __('Saptari', 'invoicing'),
+        'SIR' => __('Siraha', 'invoicing'),
+        'SOL' => __('Solukhumbu', 'invoicing'),
+        'UDA' => __('Udayapur', 'invoicing'),
+        'DHA' => __('Dhanusa', 'invoicing'),
+        'DLK' => __('Dolakha', 'invoicing'),
+        'MOH' => __('Mohottari', 'invoicing'),
+        'RAM' => __('Ramechha', 'invoicing'),
+        'SAR' => __('Sarlahi', 'invoicing'),
+        'SIN' => __('Sindhuli', 'invoicing'),
+        'BHA' => __('Bhaktapur', 'invoicing'),
+        'DHD' => __('Dhading', 'invoicing'),
+        'KTM' => __('Kathmandu', 'invoicing'),
+        'KAV' => __('Kavrepalanchowk', 'invoicing'),
+        'LAL' => __('Lalitpur', 'invoicing'),
+        'NUW' => __('Nuwakot', 'invoicing'),
+        'RAS' => __('Rasuwa', 'invoicing'),
+        'SPC' => __('Sindhupalchowk', 'invoicing'),
+        'BAR' => __('Bara', 'invoicing'),
+        'CHI' => __('Chitwan', 'invoicing'),
+        'MAK' => __('Makwanpur', 'invoicing'),
+        'PAR' => __('Parsa', 'invoicing'),
+        'RAU' => __('Rautahat', 'invoicing'),
+        'GOR' => __('Gorkha', 'invoicing'),
+        'KAS' => __('Kaski', 'invoicing'),
+        'LAM' => __('Lamjung', 'invoicing'),
+        'MAN' => __('Manang', 'invoicing'),
+        'SYN' => __('Syangja', 'invoicing'),
+        'TAN' => __('Tanahun', 'invoicing'),
+        'BAG' => __('Baglung', 'invoicing'),
+        'PBT' => __('Parbat', 'invoicing'),
+        'MUS' => __('Mustang', 'invoicing'),
+        'MYG' => __('Myagdi', 'invoicing'),
+        'AGR' => __('Agrghakanchi', 'invoicing'),
+        'GUL' => __('Gulmi', 'invoicing'),
+        'KAP' => __('Kapilbastu', 'invoicing'),
+        'NAW' => __('Nawalparasi', 'invoicing'),
+        'PAL' => __('Palpa', 'invoicing'),
+        'RUP' => __('Rupandehi', 'invoicing'),
+        'DAN' => __('Dang', 'invoicing'),
+        'PYU' => __('Pyuthan', 'invoicing'),
+        'ROL' => __('Rolpa', 'invoicing'),
+        'RUK' => __('Rukum', 'invoicing'),
+        'SAL' => __('Salyan', 'invoicing'),
+        'BAN' => __('Banke', 'invoicing'),
+        'BDA' => __('Bardiya', 'invoicing'),
+        'DAI' => __('Dailekh', 'invoicing'),
+        'JAJ' => __('Jajarkot', 'invoicing'),
+        'SUR' => __('Surkhet', 'invoicing'),
+        'DOL' => __('Dolpa', 'invoicing'),
+        'HUM' => __('Humla', 'invoicing'),
+        'JUM' => __('Jumla', 'invoicing'),
+        'KAL' => __('Kalikot', 'invoicing'),
+        'MUG' => __('Mugu', 'invoicing'),
+        'ACH' => __('Achham', 'invoicing'),
+        'BJH' => __('Bajhang', 'invoicing'),
+        'BJU' => __('Bajura', 'invoicing'),
+        'DOT' => __('Doti', 'invoicing'),
+        'KAI' => __('Kailali', 'invoicing'),
+        'BAI' => __('Baitadi', 'invoicing'),
+        'DAD' => __('Dadeldhura', 'invoicing'),
+        'DAR' => __('Darchula', 'invoicing'),
+        'KAN' => __('Kanchanpur', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_nepal_states', $states );
+    return apply_filters('wpinv_nepal_states', $states);
 }
 
 function wpinv_get_south_africa_states_list() {
     $states = array(
-        'EC'  => __( 'Eastern Cape', 'invoicing' ),
-        'FS'  => __( 'Free State', 'invoicing' ),
-        'GP'  => __( 'Gauteng', 'invoicing' ),
-        'KZN' => __( 'KwaZulu-Natal', 'invoicing' ),
-        'LP'  => __( 'Limpopo', 'invoicing' ),
-        'MP'  => __( 'Mpumalanga', 'invoicing' ),
-        'NC'  => __( 'Northern Cape', 'invoicing' ),
-        'NW'  => __( 'North West', 'invoicing' ),
-        'WC'  => __( 'Western Cape', 'invoicing' )
+        'EC'  => __('Eastern Cape', 'invoicing'),
+        'FS'  => __('Free State', 'invoicing'),
+        'GP'  => __('Gauteng', 'invoicing'),
+        'KZN' => __('KwaZulu-Natal', 'invoicing'),
+        'LP'  => __('Limpopo', 'invoicing'),
+        'MP'  => __('Mpumalanga', 'invoicing'),
+        'NC'  => __('Northern Cape', 'invoicing'),
+        'NW'  => __('North West', 'invoicing'),
+        'WC'  => __('Western Cape', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_south_africa_states', $states );
+    return apply_filters('wpinv_south_africa_states', $states);
 }
 
 function wpinv_get_thailand_states_list() {
     $states = array(
-        'TH-37' => __( 'Amnat Charoen (อำนาจเจริญ)', 'invoicing' ),
-        'TH-15' => __( 'Ang Thong (อ่างทอง)', 'invoicing' ),
-        'TH-14' => __( 'Ayutthaya (พระนครศรีอยุธยา)', 'invoicing' ),
-        'TH-10' => __( 'Bangkok (กรุงเทพมหานคร)', 'invoicing' ),
-        'TH-38' => __( 'Bueng Kan (บึงกาฬ)', 'invoicing' ),
-        'TH-31' => __( 'Buri Ram (บุรีรัมย์)', 'invoicing' ),
-        'TH-24' => __( 'Chachoengsao (ฉะเชิงเทรา)', 'invoicing' ),
-        'TH-18' => __( 'Chai Nat (ชัยนาท)', 'invoicing' ),
-        'TH-36' => __( 'Chaiyaphum (ชัยภูมิ)', 'invoicing' ),
-        'TH-22' => __( 'Chanthaburi (จันทบุรี)', 'invoicing' ),
-        'TH-50' => __( 'Chiang Mai (เชียงใหม่)', 'invoicing' ),
-        'TH-57' => __( 'Chiang Rai (เชียงราย)', 'invoicing' ),
-        'TH-20' => __( 'Chonburi (ชลบุรี)', 'invoicing' ),
-        'TH-86' => __( 'Chumphon (ชุมพร)', 'invoicing' ),
-        'TH-46' => __( 'Kalasin (กาฬสินธุ์)', 'invoicing' ),
-        'TH-62' => __( 'Kamphaeng Phet (กำแพงเพชร)', 'invoicing' ),
-        'TH-71' => __( 'Kanchanaburi (กาญจนบุรี)', 'invoicing' ),
-        'TH-40' => __( 'Khon Kaen (ขอนแก่น)', 'invoicing' ),
-        'TH-81' => __( 'Krabi (กระบี่)', 'invoicing' ),
-        'TH-52' => __( 'Lampang (ลำปาง)', 'invoicing' ),
-        'TH-51' => __( 'Lamphun (ลำพูน)', 'invoicing' ),
-        'TH-42' => __( 'Loei (เลย)', 'invoicing' ),
-        'TH-16' => __( 'Lopburi (ลพบุรี)', 'invoicing' ),
-        'TH-58' => __( 'Mae Hong Son (แม่ฮ่องสอน)', 'invoicing' ),
-        'TH-44' => __( 'Maha Sarakham (มหาสารคาม)', 'invoicing' ),
-        'TH-49' => __( 'Mukdahan (มุกดาหาร)', 'invoicing' ),
-        'TH-26' => __( 'Nakhon Nayok (นครนายก)', 'invoicing' ),
-        'TH-73' => __( 'Nakhon Pathom (นครปฐม)', 'invoicing' ),
-        'TH-48' => __( 'Nakhon Phanom (นครพนม)', 'invoicing' ),
-        'TH-30' => __( 'Nakhon Ratchasima (นครราชสีมา)', 'invoicing' ),
-        'TH-60' => __( 'Nakhon Sawan (นครสวรรค์)', 'invoicing' ),
-        'TH-80' => __( 'Nakhon Si Thammarat (นครศรีธรรมราช)', 'invoicing' ),
-        'TH-55' => __( 'Nan (น่าน)', 'invoicing' ),
-        'TH-96' => __( 'Narathiwat (นราธิวาส)', 'invoicing' ),
-        'TH-39' => __( 'Nong Bua Lam Phu (หนองบัวลำภู)', 'invoicing' ),
-        'TH-43' => __( 'Nong Khai (หนองคาย)', 'invoicing' ),
-        'TH-12' => __( 'Nonthaburi (นนทบุรี)', 'invoicing' ),
-        'TH-13' => __( 'Pathum Thani (ปทุมธานี)', 'invoicing' ),
-        'TH-94' => __( 'Pattani (ปัตตานี)', 'invoicing' ),
-        'TH-82' => __( 'Phang Nga (พังงา)', 'invoicing' ),
-        'TH-93' => __( 'Phatthalung (พัทลุง)', 'invoicing' ),
-        'TH-56' => __( 'Phayao (พะเยา)', 'invoicing' ),
-        'TH-67' => __( 'Phetchabun (เพชรบูรณ์)', 'invoicing' ),
-        'TH-76' => __( 'Phetchaburi (เพชรบุรี)', 'invoicing' ),
-        'TH-66' => __( 'Phichit (พิจิตร)', 'invoicing' ),
-        'TH-65' => __( 'Phitsanulok (พิษณุโลก)', 'invoicing' ),
-        'TH-54' => __( 'Phrae (แพร่)', 'invoicing' ),
-        'TH-83' => __( 'Phuket (ภูเก็ต)', 'invoicing' ),
-        'TH-25' => __( 'Prachin Buri (ปราจีนบุรี)', 'invoicing' ),
-        'TH-77' => __( 'Prachuap Khiri Khan (ประจวบคีรีขันธ์)', 'invoicing' ),
-        'TH-85' => __( 'Ranong (ระนอง)', 'invoicing' ),
-        'TH-70' => __( 'Ratchaburi (ราชบุรี)', 'invoicing' ),
-        'TH-21' => __( 'Rayong (ระยอง)', 'invoicing' ),
-        'TH-45' => __( 'Roi Et (ร้อยเอ็ด)', 'invoicing' ),
-        'TH-27' => __( 'Sa Kaeo (สระแก้ว)', 'invoicing' ),
-        'TH-47' => __( 'Sakon Nakhon (สกลนคร)', 'invoicing' ),
-        'TH-11' => __( 'Samut Prakan (สมุทรปราการ)', 'invoicing' ),
-        'TH-74' => __( 'Samut Sakhon (สมุทรสาคร)', 'invoicing' ),
-        'TH-75' => __( 'Samut Songkhram (สมุทรสงคราม)', 'invoicing' ),
-        'TH-19' => __( 'Saraburi (สระบุรี)', 'invoicing' ),
-        'TH-91' => __( 'Satun (สตูล)', 'invoicing' ),
-        'TH-17' => __( 'Sing Buri (สิงห์บุรี)', 'invoicing' ),
-        'TH-33' => __( 'Sisaket (ศรีสะเกษ)', 'invoicing' ),
-        'TH-90' => __( 'Songkhla (สงขลา)', 'invoicing' ),
-        'TH-64' => __( 'Sukhothai (สุโขทัย)', 'invoicing' ),
-        'TH-72' => __( 'Suphan Buri (สุพรรณบุรี)', 'invoicing' ),
-        'TH-84' => __( 'Surat Thani (สุราษฎร์ธานี)', 'invoicing' ),
-        'TH-32' => __( 'Surin (สุรินทร์)', 'invoicing' ),
-        'TH-63' => __( 'Tak (ตาก)', 'invoicing' ),
-        'TH-92' => __( 'Trang (ตรัง)', 'invoicing' ),
-        'TH-23' => __( 'Trat (ตราด)', 'invoicing' ),
-        'TH-34' => __( 'Ubon Ratchathani (อุบลราชธานี)', 'invoicing' ),
-        'TH-41' => __( 'Udon Thani (อุดรธานี)', 'invoicing' ),
-        'TH-61' => __( 'Uthai Thani (อุทัยธานี)', 'invoicing' ),
-        'TH-53' => __( 'Uttaradit (อุตรดิตถ์)', 'invoicing' ),
-        'TH-95' => __( 'Yala (ยะลา)', 'invoicing' ),
-        'TH-35' => __( 'Yasothon (ยโสธร)', 'invoicing' )
+        'TH-37' => __('Amnat Charoen (อำนาจเจริญ)', 'invoicing'),
+        'TH-15' => __('Ang Thong (อ่างทอง)', 'invoicing'),
+        'TH-14' => __('Ayutthaya (พระนครศรีอยุธยา)', 'invoicing'),
+        'TH-10' => __('Bangkok (กรุงเทพมหานคร)', 'invoicing'),
+        'TH-38' => __('Bueng Kan (บึงกาฬ)', 'invoicing'),
+        'TH-31' => __('Buri Ram (บุรีรัมย์)', 'invoicing'),
+        'TH-24' => __('Chachoengsao (ฉะเชิงเทรา)', 'invoicing'),
+        'TH-18' => __('Chai Nat (ชัยนาท)', 'invoicing'),
+        'TH-36' => __('Chaiyaphum (ชัยภูมิ)', 'invoicing'),
+        'TH-22' => __('Chanthaburi (จันทบุรี)', 'invoicing'),
+        'TH-50' => __('Chiang Mai (เชียงใหม่)', 'invoicing'),
+        'TH-57' => __('Chiang Rai (เชียงราย)', 'invoicing'),
+        'TH-20' => __('Chonburi (ชลบุรี)', 'invoicing'),
+        'TH-86' => __('Chumphon (ชุมพร)', 'invoicing'),
+        'TH-46' => __('Kalasin (กาฬสินธุ์)', 'invoicing'),
+        'TH-62' => __('Kamphaeng Phet (กำแพงเพชร)', 'invoicing'),
+        'TH-71' => __('Kanchanaburi (กาญจนบุรี)', 'invoicing'),
+        'TH-40' => __('Khon Kaen (ขอนแก่น)', 'invoicing'),
+        'TH-81' => __('Krabi (กระบี่)', 'invoicing'),
+        'TH-52' => __('Lampang (ลำปาง)', 'invoicing'),
+        'TH-51' => __('Lamphun (ลำพูน)', 'invoicing'),
+        'TH-42' => __('Loei (เลย)', 'invoicing'),
+        'TH-16' => __('Lopburi (ลพบุรี)', 'invoicing'),
+        'TH-58' => __('Mae Hong Son (แม่ฮ่องสอน)', 'invoicing'),
+        'TH-44' => __('Maha Sarakham (มหาสารคาม)', 'invoicing'),
+        'TH-49' => __('Mukdahan (มุกดาหาร)', 'invoicing'),
+        'TH-26' => __('Nakhon Nayok (นครนายก)', 'invoicing'),
+        'TH-73' => __('Nakhon Pathom (นครปฐม)', 'invoicing'),
+        'TH-48' => __('Nakhon Phanom (นครพนม)', 'invoicing'),
+        'TH-30' => __('Nakhon Ratchasima (นครราชสีมา)', 'invoicing'),
+        'TH-60' => __('Nakhon Sawan (นครสวรรค์)', 'invoicing'),
+        'TH-80' => __('Nakhon Si Thammarat (นครศรีธรรมราช)', 'invoicing'),
+        'TH-55' => __('Nan (น่าน)', 'invoicing'),
+        'TH-96' => __('Narathiwat (นราธิวาส)', 'invoicing'),
+        'TH-39' => __('Nong Bua Lam Phu (หนองบัวลำภู)', 'invoicing'),
+        'TH-43' => __('Nong Khai (หนองคาย)', 'invoicing'),
+        'TH-12' => __('Nonthaburi (นนทบุรี)', 'invoicing'),
+        'TH-13' => __('Pathum Thani (ปทุมธานี)', 'invoicing'),
+        'TH-94' => __('Pattani (ปัตตานี)', 'invoicing'),
+        'TH-82' => __('Phang Nga (พังงา)', 'invoicing'),
+        'TH-93' => __('Phatthalung (พัทลุง)', 'invoicing'),
+        'TH-56' => __('Phayao (พะเยา)', 'invoicing'),
+        'TH-67' => __('Phetchabun (เพชรบูรณ์)', 'invoicing'),
+        'TH-76' => __('Phetchaburi (เพชรบุรี)', 'invoicing'),
+        'TH-66' => __('Phichit (พิจิตร)', 'invoicing'),
+        'TH-65' => __('Phitsanulok (พิษณุโลก)', 'invoicing'),
+        'TH-54' => __('Phrae (แพร่)', 'invoicing'),
+        'TH-83' => __('Phuket (ภูเก็ต)', 'invoicing'),
+        'TH-25' => __('Prachin Buri (ปราจีนบุรี)', 'invoicing'),
+        'TH-77' => __('Prachuap Khiri Khan (ประจวบคีรีขันธ์)', 'invoicing'),
+        'TH-85' => __('Ranong (ระนอง)', 'invoicing'),
+        'TH-70' => __('Ratchaburi (ราชบุรี)', 'invoicing'),
+        'TH-21' => __('Rayong (ระยอง)', 'invoicing'),
+        'TH-45' => __('Roi Et (ร้อยเอ็ด)', 'invoicing'),
+        'TH-27' => __('Sa Kaeo (สระแก้ว)', 'invoicing'),
+        'TH-47' => __('Sakon Nakhon (สกลนคร)', 'invoicing'),
+        'TH-11' => __('Samut Prakan (สมุทรปราการ)', 'invoicing'),
+        'TH-74' => __('Samut Sakhon (สมุทรสาคร)', 'invoicing'),
+        'TH-75' => __('Samut Songkhram (สมุทรสงคราม)', 'invoicing'),
+        'TH-19' => __('Saraburi (สระบุรี)', 'invoicing'),
+        'TH-91' => __('Satun (สตูล)', 'invoicing'),
+        'TH-17' => __('Sing Buri (สิงห์บุรี)', 'invoicing'),
+        'TH-33' => __('Sisaket (ศรีสะเกษ)', 'invoicing'),
+        'TH-90' => __('Songkhla (สงขลา)', 'invoicing'),
+        'TH-64' => __('Sukhothai (สุโขทัย)', 'invoicing'),
+        'TH-72' => __('Suphan Buri (สุพรรณบุรี)', 'invoicing'),
+        'TH-84' => __('Surat Thani (สุราษฎร์ธานี)', 'invoicing'),
+        'TH-32' => __('Surin (สุรินทร์)', 'invoicing'),
+        'TH-63' => __('Tak (ตาก)', 'invoicing'),
+        'TH-92' => __('Trang (ตรัง)', 'invoicing'),
+        'TH-23' => __('Trat (ตราด)', 'invoicing'),
+        'TH-34' => __('Ubon Ratchathani (อุบลราชธานี)', 'invoicing'),
+        'TH-41' => __('Udon Thani (อุดรธานี)', 'invoicing'),
+        'TH-61' => __('Uthai Thani (อุทัยธานี)', 'invoicing'),
+        'TH-53' => __('Uttaradit (อุตรดิตถ์)', 'invoicing'),
+        'TH-95' => __('Yala (ยะลา)', 'invoicing'),
+        'TH-35' => __('Yasothon (ยโสธร)', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_thailand_states', $states );
+    return apply_filters('wpinv_thailand_states', $states);
 }
 
 function wpinv_get_turkey_states_list() {
     $states = array(
-        'TR01' => __( 'Adana', 'invoicing' ),
-        'TR02' => __( 'Adıyaman', 'invoicing' ),
-        'TR03' => __( 'Afyon', 'invoicing' ),
-        'TR04' => __( 'Ağrı', 'invoicing' ),
-        'TR05' => __( 'Amasya', 'invoicing' ),
-        'TR06' => __( 'Ankara', 'invoicing' ),
-        'TR07' => __( 'Antalya', 'invoicing' ),
-        'TR08' => __( 'Artvin', 'invoicing' ),
-        'TR09' => __( 'Aydın', 'invoicing' ),
-        'TR10' => __( 'Balıkesir', 'invoicing' ),
-        'TR11' => __( 'Bilecik', 'invoicing' ),
-        'TR12' => __( 'Bingöl', 'invoicing' ),
-        'TR13' => __( 'Bitlis', 'invoicing' ),
-        'TR14' => __( 'Bolu', 'invoicing' ),
-        'TR15' => __( 'Burdur', 'invoicing' ),
-        'TR16' => __( 'Bursa', 'invoicing' ),
-        'TR17' => __( 'Çanakkale', 'invoicing' ),
-        'TR18' => __( 'Çankıkesir', 'invoicing' ),
-        'TR19' => __( 'Çorum', 'invoicing' ),
-        'TR20' => __( 'Denizli', 'invoicing' ),
-        'TR21' => __( 'Diyarbakır', 'invoicing' ),
-        'TR22' => __( 'Edirne', 'invoicing' ),
-        'TR23' => __( 'Elazığ', 'invoicing' ),
-        'TR24' => __( 'Erzincan', 'invoicing' ),
-        'TR25' => __( 'Erzurum', 'invoicing' ),
-        'TR26' => __( 'Eskişehir', 'invoicing' ),
-        'TR27' => __( 'Gaziantep', 'invoicing' ),
-        'TR28' => __( 'Giresun', 'invoicing' ),
-        'TR29' => __( 'Gümüşhane', 'invoicing' ),
-        'TR30' => __( 'Hakkari', 'invoicing' ),
-        'TR31' => __( 'Hatay', 'invoicing' ),
-        'TR32' => __( 'Isparta', 'invoicing' ),
-        'TR33' => __( 'İçel', 'invoicing' ),
-        'TR34' => __( 'İstanbul', 'invoicing' ),
-        'TR35' => __( 'İzmir', 'invoicing' ),
-        'TR36' => __( 'Kars', 'invoicing' ),
-        'TR37' => __( 'Kastamonu', 'invoicing' ),
-        'TR38' => __( 'Kayseri', 'invoicing' ),
-        'TR39' => __( 'Kırklareli', 'invoicing' ),
-        'TR40' => __( 'Kırşehir', 'invoicing' ),
-        'TR41' => __( 'Kocaeli', 'invoicing' ),
-        'TR42' => __( 'Konya', 'invoicing' ),
-        'TR43' => __( 'Kütahya', 'invoicing' ),
-        'TR44' => __( 'Malatya', 'invoicing' ),
-        'TR45' => __( 'Manisa', 'invoicing' ),
-        'TR46' => __( 'Kahramanmaraş', 'invoicing' ),
-        'TR47' => __( 'Mardin', 'invoicing' ),
-        'TR48' => __( 'Muğla', 'invoicing' ),
-        'TR49' => __( 'Muş', 'invoicing' ),
-        'TR50' => __( 'Nevşehir', 'invoicing' ),
-        'TR51' => __( 'Niğde', 'invoicing' ),
-        'TR52' => __( 'Ordu', 'invoicing' ),
-        'TR53' => __( 'Rize', 'invoicing' ),
-        'TR54' => __( 'Sakarya', 'invoicing' ),
-        'TR55' => __( 'Samsun', 'invoicing' ),
-        'TR56' => __( 'Siirt', 'invoicing' ),
-        'TR57' => __( 'Sinop', 'invoicing' ),
-        'TR58' => __( 'Sivas', 'invoicing' ),
-        'TR59' => __( 'Tekirdağ', 'invoicing' ),
-        'TR60' => __( 'Tokat', 'invoicing' ),
-        'TR61' => __( 'Trabzon', 'invoicing' ),
-        'TR62' => __( 'Tunceli', 'invoicing' ),
-        'TR63' => __( 'Şanlıurfa', 'invoicing' ),
-        'TR64' => __( 'Uşak', 'invoicing' ),
-        'TR65' => __( 'Van', 'invoicing' ),
-        'TR66' => __( 'Yozgat', 'invoicing' ),
-        'TR67' => __( 'Zonguldak', 'invoicing' ),
-        'TR68' => __( 'Aksaray', 'invoicing' ),
-        'TR69' => __( 'Bayburt', 'invoicing' ),
-        'TR70' => __( 'Karaman', 'invoicing' ),
-        'TR71' => __( 'Kırıkkale', 'invoicing' ),
-        'TR72' => __( 'Batman', 'invoicing' ),
-        'TR73' => __( 'Şırnak', 'invoicing' ),
-        'TR74' => __( 'Bartın', 'invoicing' ),
-        'TR75' => __( 'Ardahan', 'invoicing' ),
-        'TR76' => __( 'Iğdır', 'invoicing' ),
-        'TR77' => __( 'Yalova', 'invoicing' ),
-        'TR78' => __( 'Karabük', 'invoicing' ),
-        'TR79' => __( 'Kilis', 'invoicing' ),
-        'TR80' => __( 'Osmaniye', 'invoicing' ),
-        'TR81' => __( 'Düzce', 'invoicing' )
+        'TR01' => __('Adana', 'invoicing'),
+        'TR02' => __('Adıyaman', 'invoicing'),
+        'TR03' => __('Afyon', 'invoicing'),
+        'TR04' => __('Ağrı', 'invoicing'),
+        'TR05' => __('Amasya', 'invoicing'),
+        'TR06' => __('Ankara', 'invoicing'),
+        'TR07' => __('Antalya', 'invoicing'),
+        'TR08' => __('Artvin', 'invoicing'),
+        'TR09' => __('Aydın', 'invoicing'),
+        'TR10' => __('Balıkesir', 'invoicing'),
+        'TR11' => __('Bilecik', 'invoicing'),
+        'TR12' => __('Bingöl', 'invoicing'),
+        'TR13' => __('Bitlis', 'invoicing'),
+        'TR14' => __('Bolu', 'invoicing'),
+        'TR15' => __('Burdur', 'invoicing'),
+        'TR16' => __('Bursa', 'invoicing'),
+        'TR17' => __('Çanakkale', 'invoicing'),
+        'TR18' => __('Çankıkesir', 'invoicing'),
+        'TR19' => __('Çorum', 'invoicing'),
+        'TR20' => __('Denizli', 'invoicing'),
+        'TR21' => __('Diyarbakır', 'invoicing'),
+        'TR22' => __('Edirne', 'invoicing'),
+        'TR23' => __('Elazığ', 'invoicing'),
+        'TR24' => __('Erzincan', 'invoicing'),
+        'TR25' => __('Erzurum', 'invoicing'),
+        'TR26' => __('Eskişehir', 'invoicing'),
+        'TR27' => __('Gaziantep', 'invoicing'),
+        'TR28' => __('Giresun', 'invoicing'),
+        'TR29' => __('Gümüşhane', 'invoicing'),
+        'TR30' => __('Hakkari', 'invoicing'),
+        'TR31' => __('Hatay', 'invoicing'),
+        'TR32' => __('Isparta', 'invoicing'),
+        'TR33' => __('İçel', 'invoicing'),
+        'TR34' => __('İstanbul', 'invoicing'),
+        'TR35' => __('İzmir', 'invoicing'),
+        'TR36' => __('Kars', 'invoicing'),
+        'TR37' => __('Kastamonu', 'invoicing'),
+        'TR38' => __('Kayseri', 'invoicing'),
+        'TR39' => __('Kırklareli', 'invoicing'),
+        'TR40' => __('Kırşehir', 'invoicing'),
+        'TR41' => __('Kocaeli', 'invoicing'),
+        'TR42' => __('Konya', 'invoicing'),
+        'TR43' => __('Kütahya', 'invoicing'),
+        'TR44' => __('Malatya', 'invoicing'),
+        'TR45' => __('Manisa', 'invoicing'),
+        'TR46' => __('Kahramanmaraş', 'invoicing'),
+        'TR47' => __('Mardin', 'invoicing'),
+        'TR48' => __('Muğla', 'invoicing'),
+        'TR49' => __('Muş', 'invoicing'),
+        'TR50' => __('Nevşehir', 'invoicing'),
+        'TR51' => __('Niğde', 'invoicing'),
+        'TR52' => __('Ordu', 'invoicing'),
+        'TR53' => __('Rize', 'invoicing'),
+        'TR54' => __('Sakarya', 'invoicing'),
+        'TR55' => __('Samsun', 'invoicing'),
+        'TR56' => __('Siirt', 'invoicing'),
+        'TR57' => __('Sinop', 'invoicing'),
+        'TR58' => __('Sivas', 'invoicing'),
+        'TR59' => __('Tekirdağ', 'invoicing'),
+        'TR60' => __('Tokat', 'invoicing'),
+        'TR61' => __('Trabzon', 'invoicing'),
+        'TR62' => __('Tunceli', 'invoicing'),
+        'TR63' => __('Şanlıurfa', 'invoicing'),
+        'TR64' => __('Uşak', 'invoicing'),
+        'TR65' => __('Van', 'invoicing'),
+        'TR66' => __('Yozgat', 'invoicing'),
+        'TR67' => __('Zonguldak', 'invoicing'),
+        'TR68' => __('Aksaray', 'invoicing'),
+        'TR69' => __('Bayburt', 'invoicing'),
+        'TR70' => __('Karaman', 'invoicing'),
+        'TR71' => __('Kırıkkale', 'invoicing'),
+        'TR72' => __('Batman', 'invoicing'),
+        'TR73' => __('Şırnak', 'invoicing'),
+        'TR74' => __('Bartın', 'invoicing'),
+        'TR75' => __('Ardahan', 'invoicing'),
+        'TR76' => __('Iğdır', 'invoicing'),
+        'TR77' => __('Yalova', 'invoicing'),
+        'TR78' => __('Karabük', 'invoicing'),
+        'TR79' => __('Kilis', 'invoicing'),
+        'TR80' => __('Osmaniye', 'invoicing'),
+        'TR81' => __('Düzce', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_turkey_states', $states );
+    return apply_filters('wpinv_turkey_states', $states);
 }
 
 function wpinv_get_spain_states_list() {
     $states = array(
-        'C'  => __( 'A Coruña', 'invoicing' ),
-        'VI' => __( 'Araba', 'invoicing' ),
-        'AB' => __( 'Albacete', 'invoicing' ),
-        'A'  => __( 'Alicante', 'invoicing' ),
-        'AL' => __( 'Almería', 'invoicing' ),
-        'O'  => __( 'Asturias', 'invoicing' ),
-        'AV' => __( 'Ávila', 'invoicing' ),
-        'BA' => __( 'Badajoz', 'invoicing' ),
-        'PM' => __( 'Baleares', 'invoicing' ),
-        'B'  => __( 'Barcelona', 'invoicing' ),
-        'BU' => __( 'Burgos', 'invoicing' ),
-        'CC' => __( 'Cáceres', 'invoicing' ),
-        'CA' => __( 'Cádiz', 'invoicing' ),
-        'S'  => __( 'Cantabria', 'invoicing' ),
-        'CS' => __( 'Castellón', 'invoicing' ),
-        'CE' => __( 'Ceuta', 'invoicing' ),
-        'CR' => __( 'Ciudad Real', 'invoicing' ),
-        'CO' => __( 'Córdoba', 'invoicing' ),
-        'CU' => __( 'Cuenca', 'invoicing' ),
-        'GI' => __( 'Girona', 'invoicing' ),
-        'GR' => __( 'Granada', 'invoicing' ),
-        'GU' => __( 'Guadalajara', 'invoicing' ),
-        'SS' => __( 'Gipuzkoa', 'invoicing' ),
-        'H'  => __( 'Huelva', 'invoicing' ),
-        'HU' => __( 'Huesca', 'invoicing' ),
-        'J'  => __( 'Jaén', 'invoicing' ),
-        'LO' => __( 'La Rioja', 'invoicing' ),
-        'GC' => __( 'Las Palmas', 'invoicing' ),
-        'LE' => __( 'León', 'invoicing' ),
-        'L'  => __( 'Lleida', 'invoicing' ),
-        'LU' => __( 'Lugo', 'invoicing' ),
-        'M'  => __( 'Madrid', 'invoicing' ),
-        'MA' => __( 'Málaga', 'invoicing' ),
-        'ML' => __( 'Melilla', 'invoicing' ),
-        'MU' => __( 'Murcia', 'invoicing' ),
-        'NA' => __( 'Navarra', 'invoicing' ),
-        'OR' => __( 'Ourense', 'invoicing' ),
-        'P'  => __( 'Palencia', 'invoicing' ),
-        'PO' => __( 'Pontevedra', 'invoicing' ),
-        'SA' => __( 'Salamanca', 'invoicing' ),
-        'TF' => __( 'Santa Cruz de Tenerife', 'invoicing' ),
-        'SG' => __( 'Segovia', 'invoicing' ),
-        'SE' => __( 'Sevilla', 'invoicing' ),
-        'SO' => __( 'Soria', 'invoicing' ),
-        'T'  => __( 'Tarragona', 'invoicing' ),
-        'TE' => __( 'Teruel', 'invoicing' ),
-        'TO' => __( 'Toledo', 'invoicing' ),
-        'V'  => __( 'Valencia', 'invoicing' ),
-        'VA' => __( 'Valladolid', 'invoicing' ),
-        'BI' => __( 'Bizkaia', 'invoicing' ),
-        'ZA' => __( 'Zamora', 'invoicing' ),
-        'Z'  => __( 'Zaragoza', 'invoicing' )
+        'C'  => __('A Coruña', 'invoicing'),
+        'VI' => __('Araba', 'invoicing'),
+        'AB' => __('Albacete', 'invoicing'),
+        'A'  => __('Alicante', 'invoicing'),
+        'AL' => __('Almería', 'invoicing'),
+        'O'  => __('Asturias', 'invoicing'),
+        'AV' => __('Ávila', 'invoicing'),
+        'BA' => __('Badajoz', 'invoicing'),
+        'PM' => __('Baleares', 'invoicing'),
+        'B'  => __('Barcelona', 'invoicing'),
+        'BU' => __('Burgos', 'invoicing'),
+        'CC' => __('Cáceres', 'invoicing'),
+        'CA' => __('Cádiz', 'invoicing'),
+        'S'  => __('Cantabria', 'invoicing'),
+        'CS' => __('Castellón', 'invoicing'),
+        'CE' => __('Ceuta', 'invoicing'),
+        'CR' => __('Ciudad Real', 'invoicing'),
+        'CO' => __('Córdoba', 'invoicing'),
+        'CU' => __('Cuenca', 'invoicing'),
+        'GI' => __('Girona', 'invoicing'),
+        'GR' => __('Granada', 'invoicing'),
+        'GU' => __('Guadalajara', 'invoicing'),
+        'SS' => __('Gipuzkoa', 'invoicing'),
+        'H'  => __('Huelva', 'invoicing'),
+        'HU' => __('Huesca', 'invoicing'),
+        'J'  => __('Jaén', 'invoicing'),
+        'LO' => __('La Rioja', 'invoicing'),
+        'GC' => __('Las Palmas', 'invoicing'),
+        'LE' => __('León', 'invoicing'),
+        'L'  => __('Lleida', 'invoicing'),
+        'LU' => __('Lugo', 'invoicing'),
+        'M'  => __('Madrid', 'invoicing'),
+        'MA' => __('Málaga', 'invoicing'),
+        'ML' => __('Melilla', 'invoicing'),
+        'MU' => __('Murcia', 'invoicing'),
+        'NA' => __('Navarra', 'invoicing'),
+        'OR' => __('Ourense', 'invoicing'),
+        'P'  => __('Palencia', 'invoicing'),
+        'PO' => __('Pontevedra', 'invoicing'),
+        'SA' => __('Salamanca', 'invoicing'),
+        'TF' => __('Santa Cruz de Tenerife', 'invoicing'),
+        'SG' => __('Segovia', 'invoicing'),
+        'SE' => __('Sevilla', 'invoicing'),
+        'SO' => __('Soria', 'invoicing'),
+        'T'  => __('Tarragona', 'invoicing'),
+        'TE' => __('Teruel', 'invoicing'),
+        'TO' => __('Toledo', 'invoicing'),
+        'V'  => __('Valencia', 'invoicing'),
+        'VA' => __('Valladolid', 'invoicing'),
+        'BI' => __('Bizkaia', 'invoicing'),
+        'ZA' => __('Zamora', 'invoicing'),
+        'Z'  => __('Zaragoza', 'invoicing')
     );
 
-    return apply_filters( 'wpinv_spain_states', $states );
+    return apply_filters('wpinv_spain_states', $states);
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = wpinv_get_default_country();
 	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+	if (!empty($states)) {
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
         
         $args = array(
 			'name'    => $sanitized_field_name,
 			'id'      => $sanitized_field_name,
 			'class'   => $sanitized_field_name . ' wpinv-select wpi_select2',
-			'options' => array_merge( array( '' => '' ), $states ),
+			'options' => array_merge(array('' => ''), $states),
 			'show_option_all'  => false,
 			'show_option_none' => false
 		);
 
-		$response = wpinv_html_select( $args );
+		$response = wpinv_html_select($args);
 
 	} else {
 		$response = 'nostates';
@@ -1563,8 +1563,8 @@ 
 	return $response;
 }
 
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
-    $country = !empty( $country ) ? $country : wpinv_get_default_country();
+function wpinv_default_billing_country($country = '', $user_id = 0) {
+    $country = !empty($country) ? $country : wpinv_get_default_country();
     
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
 }
\ No newline at end of file

includes/wpinv-item-functions.php

Braces +9 added lines, -5 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 function wpinv_get_item_by( $field = '', $value = '', $type = '' ) {
     if( empty( $field ) || empty( $value ) ) {
@@ -118,8 +120,9 @@ 
 function wpinv_get_item( $item = 0 ) {
     if ( is_numeric( $item ) ) {
         $item = get_post( $item );
-        if ( ! $item || 'wpi_item' !== $item->post_type )
-            return null;
+        if ( ! $item || 'wpi_item' !== $item->post_type ) {
+                    return null;
+        }
         return $item;
     }
 
@@ -283,8 +286,9 @@ 
 }
 
 function wpinv_remove_item_logs_on_delete( $item_id = 0 ) {
-    if ( 'wpi_item' !== get_post_type( $item_id ) )
-        return;
+    if ( 'wpi_item' !== get_post_type( $item_id ) ) {
+            return;
+    }
 
     global $wpinv_logs;
     

Indentation +1 added lines, -1 removed lines

@@ -799,7 +799,7 @@
                 case 'trial_interval':
                     $value = absint( $value );
                 break;
-				case 'editable':
+                case 'editable':
                     $value = (int) $value;
                 break;
             }

Spacing +281 added lines, -281 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-function wpinv_get_item_by( $field = '', $value = '', $type = '' ) {
-    if( empty( $field ) || empty( $value ) ) {
+function wpinv_get_item_by($field = '', $value = '', $type = '') {
+    if (empty($field) || empty($value)) {
         return false;
     }
     
     $posts = array();
 
-    switch( strtolower( $field ) ) {
+    switch (strtolower($field)) {
         case 'id':
-            $item = new WPInv_Item( $value );
+            $item = new WPInv_Item($value);
 
-            if ( !empty( $item ) && $item->post_type == 'wpi_item' ) {
+            if (!empty($item) && $item->post_type == 'wpi_item') {
                 return $item;
             }
             return false;
@@ -22,16 +22,16 @@ 
 
         case 'slug':
         case 'name':
-            $posts = get_posts( array(
+            $posts = get_posts(array(
                 'post_type'      => 'wpi_item',
                 'name'           => $value,
                 'posts_per_page' => 1,
                 'post_status'    => 'any'
-            ) );
+            ));
 
             break;
         case 'custom_id':
-            if ( empty( $value ) || empty( $type ) ) {
+            if (empty($value) || empty($type)) {
                 return false;
             }
             
@@ -51,10 +51,10 @@ 
                 'post_status'    => 'any',
                 'orderby'        => 'ID',
                 'order'          => 'ASC',
-                'meta_query'     => array( $meta_query )
+                'meta_query'     => array($meta_query)
             );
             
-            $posts = get_posts( $args );
+            $posts = get_posts($args);
 
             break;
 
@@ -62,10 +62,10 @@ 
             return false;
     }
     
-    if ( !empty( $posts[0] ) ) {
-        $item = new WPInv_Item( $posts[0]->ID );
+    if (!empty($posts[0])) {
+        $item = new WPInv_Item($posts[0]->ID);
 
-        if ( !empty( $item ) && $item->post_type == 'wpi_item' ) {
+        if (!empty($item) && $item->post_type == 'wpi_item') {
             return $item;
         }
     }
@@ -73,10 +73,10 @@ 
     return false;
 }
 
-function wpinv_get_item( $item = 0 ) {
-    if ( is_numeric( $item ) ) {
-        $item = get_post( $item );
-        if ( ! $item || 'wpi_item' !== $item->post_type )
+function wpinv_get_item($item = 0) {
+    if (is_numeric($item)) {
+        $item = get_post($item);
+        if (!$item || 'wpi_item' !== $item->post_type)
             return null;
         return $item;
     }
@@ -89,150 +89,150 @@ 
 
     $item = get_posts($args);
 
-    if ( $item ) {
+    if ($item) {
         return $item[0];
     }
 
     return null;
 }
 
-function wpinv_is_free_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_free_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_free();
 }
 
-function wpinv_item_is_editable( $item = 0 ) {
-    if ( !empty( $item ) && is_a( $item, 'WP_Post' ) ) {
+function wpinv_item_is_editable($item = 0) {
+    if (!empty($item) && is_a($item, 'WP_Post')) {
         $item = $item->ID;
     }
         
-    if ( empty( $item ) ) {
+    if (empty($item)) {
         return true;
     }
 
-    $item = new WPInv_Item( $item );
+    $item = new WPInv_Item($item);
     
-    return (bool) $item->is_editable();
+    return (bool)$item->is_editable();
 }
 
-function wpinv_get_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_price();
 }
 
-function wpinv_is_recurring_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_recurring_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->is_recurring();
 }
 
-function wpinv_item_price( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $price = wpinv_get_item_price( $item_id );
-    $price = wpinv_price( wpinv_format_amount( $price ) );
+    $price = wpinv_get_item_price($item_id);
+    $price = wpinv_price(wpinv_format_amount($price));
     
-    return apply_filters( 'wpinv_item_price', $price, $item_id );
+    return apply_filters('wpinv_item_price', $price, $item_id);
 }
 
-function wpinv_item_show_price( $item_id = 0, $echo = true ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_show_price($item_id = 0, $echo = true) {
+    if (empty($item_id)) {
         $item_id = get_the_ID();
     }
 
-    $price = wpinv_item_price( $item_id );
+    $price = wpinv_item_price($item_id);
 
-    $price           = apply_filters( 'wpinv_item_price', wpinv_sanitize_amount( $price ), $item_id );
+    $price           = apply_filters('wpinv_item_price', wpinv_sanitize_amount($price), $item_id);
     $formatted_price = '<span class="wpinv_price" id="wpinv_item_' . $item_id . '">' . $price . '</span>';
-    $formatted_price = apply_filters( 'wpinv_item_price_after_html', $formatted_price, $item_id, $price );
+    $formatted_price = apply_filters('wpinv_item_price_after_html', $formatted_price, $item_id, $price);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $formatted_price;
     } else {
         return $formatted_price;
     }
 }
 
-function wpinv_get_item_final_price( $item_id = 0, $amount_override = null ) {
-    if ( is_null( $amount_override ) ) {
-        $original_price = get_post_meta( $item_id, '_wpinv_price', true );
+function wpinv_get_item_final_price($item_id = 0, $amount_override = null) {
+    if (is_null($amount_override)) {
+        $original_price = get_post_meta($item_id, '_wpinv_price', true);
     } else {
         $original_price = $amount_override;
     }
     
     $price = $original_price;
 
-    return apply_filters( 'wpinv_get_item_final_price', $price, $item_id );
+    return apply_filters('wpinv_get_item_final_price', $price, $item_id);
 }
 
-function wpinv_item_custom_singular_name( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_item_custom_singular_name($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_custom_singular_name();
 }
 
 function wpinv_get_item_types() {
     $item_types = array(
-            'custom'    => __( 'Standard', 'invoicing' ),
-            'fee'       => __( 'Fee', 'invoicing' ),
+            'custom'    => __('Standard', 'invoicing'),
+            'fee'       => __('Fee', 'invoicing'),
         );
-    return apply_filters( 'wpinv_get_item_types', $item_types );
+    return apply_filters('wpinv_get_item_types', $item_types);
 }
 
 function wpinv_item_types() {
     $item_types = wpinv_get_item_types();
     
-    return ( !empty( $item_types ) ? array_keys( $item_types ) : array() );
+    return (!empty($item_types) ? array_keys($item_types) : array());
 }
 
-function wpinv_get_item_type( $item_id ) {
-    if( empty( $item_id ) ) {
+function wpinv_get_item_type($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
     
     return $item->get_type();
 }
 
-function wpinv_item_type( $item_id ) {
+function wpinv_item_type($item_id) {
     $item_types = wpinv_get_item_types();
     
-    $item_type = wpinv_get_item_type( $item_id );
+    $item_type = wpinv_get_item_type($item_id);
     
-    if ( empty( $item_type ) ) {
+    if (empty($item_type)) {
         $item_type = '-';
     }
     
-    $item_type = isset( $item_types[$item_type] ) ? $item_types[$item_type] : __( $item_type, 'invoicing' );
+    $item_type = isset($item_types[$item_type]) ? $item_types[$item_type] : __($item_type, 'invoicing');
 
-    return apply_filters( 'wpinv_item_type', $item_type, $item_id );
+    return apply_filters('wpinv_item_type', $item_type, $item_id);
 }
 
-function wpinv_record_item_in_log( $item_id = 0, $file_id, $user_info, $ip, $invoice_id ) {
+function wpinv_record_item_in_log($item_id = 0, $file_id, $user_info, $ip, $invoice_id) {
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
@@ -241,7 +241,7 @@ 
         'log_type'		=> 'wpi_item'
     );
 
-    $user_id = isset( $user_info['user_id'] ) ? $user_info['user_id'] : (int) -1;
+    $user_id = isset($user_info['user_id']) ? $user_info['user_id'] : (int) -1;
 
     $log_meta = array(
         'user_info'	=> $user_info,
@@ -251,254 +251,254 @@ 
         'invoice_id'=> $invoice_id,
     );
 
-    $wpinv_logs->insert_log( $log_data, $log_meta );
+    $wpinv_logs->insert_log($log_data, $log_meta);
 }
 
-function wpinv_remove_item_logs_on_delete( $item_id = 0 ) {
-    if ( 'wpi_item' !== get_post_type( $item_id ) )
+function wpinv_remove_item_logs_on_delete($item_id = 0) {
+    if ('wpi_item' !== get_post_type($item_id))
         return;
 
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
     // Remove all log entries related to this item
-    $wpinv_logs->delete_logs( $item_id );
+    $wpinv_logs->delete_logs($item_id);
 }
-add_action( 'delete_post', 'wpinv_remove_item_logs_on_delete' );
+add_action('delete_post', 'wpinv_remove_item_logs_on_delete');
 
-function wpinv_get_random_item( $post_ids = true ) {
-    wpinv_get_random_items( 1, $post_ids );
+function wpinv_get_random_item($post_ids = true) {
+    wpinv_get_random_items(1, $post_ids);
 }
 
-function wpinv_get_random_items( $num = 3, $post_ids = true ) {
-    if ( $post_ids ) {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids' );
+function wpinv_get_random_items($num = 3, $post_ids = true) {
+    if ($post_ids) {
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids');
     } else {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num );
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num);
     }
     
-    $args  = apply_filters( 'wpinv_get_random_items', $args );
+    $args = apply_filters('wpinv_get_random_items', $args);
     
-    return get_posts( $args );
+    return get_posts($args);
 }
 
-function wpinv_get_item_token( $url = '' ) {
+function wpinv_get_item_token($url = '') {
     $args    = array();
-    $hash    = apply_filters( 'wpinv_get_url_token_algorithm', 'sha256' );
-    $secret  = apply_filters( 'wpinv_get_url_token_secret', hash( $hash, wp_salt() ) );
+    $hash    = apply_filters('wpinv_get_url_token_algorithm', 'sha256');
+    $secret  = apply_filters('wpinv_get_url_token_secret', hash($hash, wp_salt()));
 
-    $parts   = parse_url( $url );
+    $parts   = parse_url($url);
     $options = array();
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        if ( ! empty( $query_args['o'] ) ) {
-            $options = explode( ':', rawurldecode( $query_args['o'] ) );
+        if (!empty($query_args['o'])) {
+            $options = explode(':', rawurldecode($query_args['o']));
 
-            if ( in_array( 'ip', $options ) ) {
+            if (in_array('ip', $options)) {
                 $args['ip'] = wpinv_get_ip();
             }
 
-            if ( in_array( 'ua', $options ) ) {
+            if (in_array('ua', $options)) {
                 $ua = wpinv_get_user_agent();
-                $args['user_agent'] = rawurlencode( $ua );
+                $args['user_agent'] = rawurlencode($ua);
             }
         }
     }
 
-    $args = apply_filters( 'wpinv_get_url_token_args', $args, $url, $options );
+    $args = apply_filters('wpinv_get_url_token_args', $args, $url, $options);
 
     $args['secret'] = $secret;
     $args['token']  = false;
 
-    $url   = add_query_arg( $args, $url );
-    $parts = parse_url( $url );
+    $url   = add_query_arg($args, $url);
+    $parts = parse_url($url);
 
-    if ( ! isset( $parts['path'] ) ) {
+    if (!isset($parts['path'])) {
         $parts['path'] = '';
     }
 
-    $token = md5( $parts['path'] . '?' . $parts['query'] );
+    $token = md5($parts['path'] . '?' . $parts['query']);
 
     return $token;
 }
 
-function wpinv_validate_url_token( $url = '' ) {
+function wpinv_validate_url_token($url = '') {
     $ret   = false;
-    $parts = parse_url( $url );
+    $parts = parse_url($url);
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        $allowed = apply_filters( 'wpinv_url_token_allowed_params', array(
+        $allowed = apply_filters('wpinv_url_token_allowed_params', array(
             'item',
             'ttl',
             'token'
-        ) );
+        ));
 
         $remove = array();
 
-        foreach( $query_args as $key => $value ) {
-            if( false === in_array( $key, $allowed ) ) {
+        foreach ($query_args as $key => $value) {
+            if (false === in_array($key, $allowed)) {
                 $remove[] = $key;
             }
         }
 
-        if( ! empty( $remove ) ) {
-            $url = remove_query_arg( $remove, $url );
+        if (!empty($remove)) {
+            $url = remove_query_arg($remove, $url);
         }
 
-        if ( isset( $query_args['ttl'] ) && current_time( 'timestamp' ) > $query_args['ttl'] ) {
-            wp_die( apply_filters( 'wpinv_item_link_expired_text', __( 'Sorry but your item link has expired.', 'invoicing' ) ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+        if (isset($query_args['ttl']) && current_time('timestamp') > $query_args['ttl']) {
+            wp_die(apply_filters('wpinv_item_link_expired_text', __('Sorry but your item link has expired.', 'invoicing')), __('Error', 'invoicing'), array('response' => 403));
         }
 
-        if ( isset( $query_args['token'] ) && $query_args['token'] == wpinv_get_item_token( $url ) ) {
+        if (isset($query_args['token']) && $query_args['token'] == wpinv_get_item_token($url)) {
             $ret = true;
         }
 
     }
 
-    return apply_filters( 'wpinv_validate_url_token', $ret, $url, $query_args );
+    return apply_filters('wpinv_validate_url_token', $ret, $url, $query_args);
 }
 
-function wpinv_item_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_item_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
     $ret = false;
 
-    if ( is_array( $cart_items ) ) {
-        foreach ( $cart_items as $item ) {
-            if ( $item['id'] == $item_id ) {
+    if (is_array($cart_items)) {
+        foreach ($cart_items as $item) {
+            if ($item['id'] == $item_id) {
                 $ret = true;
                 break;
             }
         }
     }
 
-    return (bool) apply_filters( 'wpinv_item_in_cart', $ret, $item_id, $options );
+    return (bool)apply_filters('wpinv_item_in_cart', $ret, $item_id, $options);
 }
 
-function wpinv_get_cart_item_tax( $item_id = 0, $subtotal = '', $options = array() ) {
+function wpinv_get_cart_item_tax($item_id = 0, $subtotal = '', $options = array()) {
     $tax = 0;
-    if ( ! wpinv_item_is_tax_exclusive( $item_id ) ) {
-        $country = !empty( $_POST['country'] ) ? $_POST['country'] : false;
-        $state   = isset( $_POST['state'] ) ? $_POST['state'] : '';
+    if (!wpinv_item_is_tax_exclusive($item_id)) {
+        $country = !empty($_POST['country']) ? $_POST['country'] : false;
+        $state   = isset($_POST['state']) ? $_POST['state'] : '';
 
-        $tax = wpinv_calculate_tax( $subtotal, $country, $state, $item_id );
+        $tax = wpinv_calculate_tax($subtotal, $country, $state, $item_id);
     }
 
-    return apply_filters( 'wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options );
+    return apply_filters('wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options);
 }
 
-function wpinv_cart_item_price( $item ) {
-    $item_id    = isset( $item['id'] ) ? $item['id'] : 0;
-    $price      = isset( $item['item_price'] ) ? wpinv_round_amount( $item['item_price'] ) : 0;
-    $tax        = wpinv_price( wpinv_format_amount( $item['tax'] ) );
+function wpinv_cart_item_price($item) {
+    $item_id    = isset($item['id']) ? $item['id'] : 0;
+    $price      = isset($item['item_price']) ? wpinv_round_amount($item['item_price']) : 0;
+    $tax        = wpinv_price(wpinv_format_amount($item['tax']));
     
-    if ( !wpinv_is_free_item( $item_id ) && !wpinv_item_is_tax_exclusive( $item_id ) ) {
-        if ( wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax() ) {
+    if (!wpinv_is_free_item($item_id) && !wpinv_item_is_tax_exclusive($item_id)) {
+        if (wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax()) {
             $price += $tax;
         }
         
-        if( !wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax() ) {
+        if (!wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax()) {
             $price -= $tax;
         }        
     }
 
-    $price = wpinv_price( wpinv_format_amount( $price ) );
+    $price = wpinv_price(wpinv_format_amount($price));
 
-    return apply_filters( 'wpinv_cart_item_price_label', $price, $item );
+    return apply_filters('wpinv_cart_item_price_label', $price, $item);
 }
 
-function wpinv_cart_item_subtotal( $item ) {
-    $subtotal   = isset( $item['subtotal'] ) ? $item['subtotal'] : 0;
-    $subtotal   = wpinv_price( wpinv_format_amount( $subtotal ) );
+function wpinv_cart_item_subtotal($item) {
+    $subtotal   = isset($item['subtotal']) ? $item['subtotal'] : 0;
+    $subtotal   = wpinv_price(wpinv_format_amount($subtotal));
 
-    return apply_filters( 'wpinv_cart_item_subtotal_label', $subtotal, $item );
+    return apply_filters('wpinv_cart_item_subtotal_label', $subtotal, $item);
 }
 
-function wpinv_cart_item_tax( $item ) {
+function wpinv_cart_item_tax($item) {
     $tax        = '';
     $tax_rate   = '';
     
-    if ( isset( $item['tax'] ) && $item['tax'] > 0 && $item['subtotal'] > 0 ) {
-        $tax      = wpinv_price( wpinv_format_amount( $item['tax'] ) );
-        $tax_rate = !empty( $item['vat_rate'] ) ? $item['vat_rate'] : ( $item['tax'] / $item['subtotal'] ) * 100;
-        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+    if (isset($item['tax']) && $item['tax'] > 0 && $item['subtotal'] > 0) {
+        $tax      = wpinv_price(wpinv_format_amount($item['tax']));
+        $tax_rate = !empty($item['vat_rate']) ? $item['vat_rate'] : ($item['tax'] / $item['subtotal']) * 100;
+        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount($tax_rate, 4) : '';
         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate normal small">(' . $tax_rate . '%)</small>' : '';
     }
     
-    $tax        = $tax . $tax_rate;
+    $tax = $tax . $tax_rate;
     
-    if ( $tax === '' ) {
+    if ($tax === '') {
         $tax = 0; // Zero tax
     }
 
-    return apply_filters( 'wpinv_cart_item_tax_label', $tax, $item );
+    return apply_filters('wpinv_cart_item_tax_label', $tax, $item);
 }
 
-function wpinv_get_cart_item_price( $item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false ) {
+function wpinv_get_cart_item_price($item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false) {
     $price = 0;
     
     // Set custom price
-    if ( isset( $cart_item['custom_price'] ) && $cart_item['custom_price'] !== '' ) {
+    if (isset($cart_item['custom_price']) && $cart_item['custom_price'] !== '') {
         $price = $cart_item['custom_price'];
     } else {
-        $variable_prices = wpinv_has_variable_prices( $item_id );
+        $variable_prices = wpinv_has_variable_prices($item_id);
 
-        if ( $variable_prices ) {
-            $prices = wpinv_get_variable_prices( $item_id );
+        if ($variable_prices) {
+            $prices = wpinv_get_variable_prices($item_id);
 
-            if ( $prices ) {
-                if( ! empty( $options ) ) {
-                    $price = isset( $prices[ $options['price_id'] ] ) ? $prices[ $options['price_id'] ]['amount'] : false;
+            if ($prices) {
+                if (!empty($options)) {
+                    $price = isset($prices[$options['price_id']]) ? $prices[$options['price_id']]['amount'] : false;
                 } else {
                     $price = false;
                 }
             }
         }
 
-        if( ! $variable_prices || false === $price ) {
-            if($cart_item['item_price'] > 0){
+        if (!$variable_prices || false === $price) {
+            if ($cart_item['item_price'] > 0) {
                 $price = $cart_item['item_price'];
             } else {
                 // Get the standard Item price if not using variable prices
-                $price = wpinv_get_item_price( $item_id );
+                $price = wpinv_get_item_price($item_id);
             }
         }
     }
 
-    if ( $remove_tax_from_inclusive && wpinv_prices_include_tax() ) {
-        $price -= wpinv_get_cart_item_tax( $item_id, $price, $options );
+    if ($remove_tax_from_inclusive && wpinv_prices_include_tax()) {
+        $price -= wpinv_get_cart_item_tax($item_id, $price, $options);
     }
 
-    return apply_filters( 'wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive );
+    return apply_filters('wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive);
 }
 
-function wpinv_get_cart_item_price_id( $item = array() ) {
-    if( isset( $item['item_number'] ) ) {
-        $price_id = isset( $item['item_number']['options']['price_id'] ) ? $item['item_number']['options']['price_id'] : null;
+function wpinv_get_cart_item_price_id($item = array()) {
+    if (isset($item['item_number'])) {
+        $price_id = isset($item['item_number']['options']['price_id']) ? $item['item_number']['options']['price_id'] : null;
     } else {
-        $price_id = isset( $item['options']['price_id'] ) ? $item['options']['price_id'] : null;
+        $price_id = isset($item['options']['price_id']) ? $item['options']['price_id'] : null;
     }
     return $price_id;
 }
 
-function wpinv_get_cart_item_price_name( $item = array() ) {
-    $price_id = (int)wpinv_get_cart_item_price_id( $item );
-    $prices   = wpinv_get_variable_prices( $item['id'] );
-    $name     = ! empty( $prices[ $price_id ] ) ? $prices[ $price_id ]['name'] : '';
-    return apply_filters( 'wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item );
+function wpinv_get_cart_item_price_name($item = array()) {
+    $price_id = (int)wpinv_get_cart_item_price_id($item);
+    $prices   = wpinv_get_variable_prices($item['id']);
+    $name     = !empty($prices[$price_id]) ? $prices[$price_id]['name'] : '';
+    return apply_filters('wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item);
 }
 
-function wpinv_get_cart_item_name( $item = array() ) {
-    $item_title = !empty( $item['name'] ) ? $item['name'] : get_the_title( $item['id'] );
+function wpinv_get_cart_item_name($item = array()) {
+    $item_title = !empty($item['name']) ? $item['name'] : get_the_title($item['id']);
 
-    if ( empty( $item_title ) ) {
+    if (empty($item_title)) {
         $item_title = $item['id'];
     }
 
@@ -508,23 +508,23 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_get_cart_item_name', $item_title, $item['id'], $item );
+    return apply_filters('wpinv_get_cart_item_name', $item_title, $item['id'], $item);
 }
 
-function wpinv_has_variable_prices( $item_id = 0 ) {
+function wpinv_has_variable_prices($item_id = 0) {
     return false;
 }
 
-function wpinv_get_item_position_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_get_item_position_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
-    if ( !is_array( $cart_items ) ) {
+    if (!is_array($cart_items)) {
         return false; // Empty cart
     } else {
-        foreach ( $cart_items as $position => $item ) {
-            if ( $item['id'] == $item_id ) {
-                if ( isset( $options['price_id'] ) && isset( $item['options']['price_id'] ) ) {
-                    if ( (int) $options['price_id'] == (int) $item['options']['price_id'] ) {
+        foreach ($cart_items as $position => $item) {
+            if ($item['id'] == $item_id) {
+                if (isset($options['price_id']) && isset($item['options']['price_id'])) {
+                    if ((int)$options['price_id'] == (int)$item['options']['price_id']) {
                         return $position;
                     }
                 } else {
@@ -537,80 +537,80 @@ 
     return false; // Not found
 }
 
-function wpinv_get_cart_item_quantity( $item ) {
-    if ( wpinv_item_quantities_enabled() ) {
-        $quantity = !empty( $item['quantity'] ) && (int)$item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
+function wpinv_get_cart_item_quantity($item) {
+    if (wpinv_item_quantities_enabled()) {
+        $quantity = !empty($item['quantity']) && (int)$item['quantity'] > 0 ? absint($item['quantity']) : 1;
     } else {
         $quantity = 1;
     }
     
-    if ( $quantity < 1 ) {
+    if ($quantity < 1) {
         $quantity = 1;
     }
     
-    return apply_filters( 'wpinv_get_cart_item_quantity', $quantity, $item );
+    return apply_filters('wpinv_get_cart_item_quantity', $quantity, $item);
 }
 
-function wpinv_get_item_suffix( $item, $html = true ) {
-    if ( empty( $item ) ) {
+function wpinv_get_item_suffix($item, $html = true) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '';
+    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '';
     
-    if ( !$html && $suffix ) {
-        $suffix = strip_tags( $suffix );
+    if (!$html && $suffix) {
+        $suffix = strip_tags($suffix);
     }
     
-    return apply_filters( 'wpinv_get_item_suffix', $suffix, $item, $html );
+    return apply_filters('wpinv_get_item_suffix', $suffix, $item, $html);
 }
 
-function wpinv_remove_item( $item = 0, $force_delete = false ) {
-    if ( empty( $item ) ) {
+function wpinv_remove_item($item = 0, $force_delete = false) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    do_action( 'wpinv_pre_delete_item', $item );
+    do_action('wpinv_pre_delete_item', $item);
 
-    wp_delete_post( $item->ID, $force_delete );
+    wp_delete_post($item->ID, $force_delete);
 
-    do_action( 'wpinv_post_delete_item', $item );
+    do_action('wpinv_post_delete_item', $item);
 }
 
-function wpinv_can_delete_item( $post_id ) {
-    $return = current_user_can( 'manage_options' ) ? true : false;
+function wpinv_can_delete_item($post_id) {
+    $return = current_user_can('manage_options') ? true : false;
     
-    if ( $return && wpinv_item_in_use( $post_id ) ) {
+    if ($return && wpinv_item_in_use($post_id)) {
         $return = false; // Don't delete item already use in invoices.
     }
     
-    return apply_filters( 'wpinv_can_delete_item', $return, $post_id );
+    return apply_filters('wpinv_can_delete_item', $return, $post_id);
 }
 
 function wpinv_admin_action_delete() {
     $screen = get_current_screen();
     
-    if ( !empty( $screen->post_type ) && $screen->post_type == 'wpi_item' && !empty( $_REQUEST['post'] ) && is_array( $_REQUEST['post'] ) ) {
+    if (!empty($screen->post_type) && $screen->post_type == 'wpi_item' && !empty($_REQUEST['post']) && is_array($_REQUEST['post'])) {
         $post_ids = array();
         
-        foreach ( $_REQUEST['post'] as $post_id ) {
-            if ( !wpinv_can_delete_item( $post_id ) ) {
+        foreach ($_REQUEST['post'] as $post_id) {
+            if (!wpinv_can_delete_item($post_id)) {
                 continue;
             }
             
@@ -620,86 +620,86 @@ 
         $_REQUEST['post'] = $post_ids;
     }
 }
-add_action( 'admin_action_trash', 'wpinv_admin_action_delete', -10 );
-add_action( 'admin_action_delete', 'wpinv_admin_action_delete', -10 );
+add_action('admin_action_trash', 'wpinv_admin_action_delete', -10);
+add_action('admin_action_delete', 'wpinv_admin_action_delete', -10);
 
-function wpinv_check_delete_item( $check, $post, $force_delete ) {
-    if ( $post->post_type == 'wpi_item' ) {
-        if ( $force_delete && !wpinv_can_delete_item( $post->ID ) ) {
+function wpinv_check_delete_item($check, $post, $force_delete) {
+    if ($post->post_type == 'wpi_item') {
+        if ($force_delete && !wpinv_can_delete_item($post->ID)) {
             return true;
         }
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_item', 10, 3 );
+add_filter('pre_delete_post', 'wpinv_check_delete_item', 10, 3);
 
-function wpinv_item_in_use( $item_id ) {
+function wpinv_item_in_use($item_id) {
     global $wpdb, $wpi_items_in_use;
     
-    if ( !$item_id > 0 ) {
+    if (!$item_id > 0) {
         return false;
     }
     
-    if ( !empty( $wpi_items_in_use ) ) {
-        if ( isset( $wpi_items_in_use[$item_id] ) ) {
+    if (!empty($wpi_items_in_use)) {
+        if (isset($wpi_items_in_use[$item_id])) {
             return $wpi_items_in_use[$item_id];
         }
     } else {
         $wpi_items_in_use = array();
     }
     
-    $statuses   = array_keys( wpinv_get_invoice_statuses( true, true ) );
+    $statuses = array_keys(wpinv_get_invoice_statuses(true, true));
     
-    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode( "','", $statuses ) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int)$item_id . "', pm.meta_value )";
-    $in_use = $wpdb->get_var( $query ) > 0 ? true : false;
+    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode("','", $statuses) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int)$item_id . "', pm.meta_value )";
+    $in_use = $wpdb->get_var($query) > 0 ? true : false;
     
     $wpi_items_in_use[$item_id] = $in_use;
     
     return $in_use;
 }
 
-function wpinv_create_item( $args = array(), $wp_error = false, $force_update = false ) {
+function wpinv_create_item($args = array(), $wp_error = false, $force_update = false) {
     // Set some defaults
     $defaults = array(
-        'type'                 => 'custom',                                                // Optional. Item type. Default 'custom'.
-        'title'                => '',                                                      // Required. Item title.
-        'custom_id'            => 0,                                                       // Optional. Any integer or non numeric id. Must be unique within item type.
-        'price'                => '0.00',                                                  // Optional. Item price. Default '0.00'.
-        'status'               => 'pending',                                               // Optional. pending, publish
-        'custom_name'          => '',                                                      // Optional. Plural sub title for item.
-        'custom_singular_name' => '',                                                      // Optional. Singular sub title for item.
-        'vat_rule'             => 'digital',                                               // Optional. digital => Digital item, physical => Physical item
-        'editable'             => true,                                                    // Optional. Item editable from Items list page? Default true.
-        'excerpt'              => '',                                                      // Optional. Item short description
+        'type'                 => 'custom', // Optional. Item type. Default 'custom'.
+        'title'                => '', // Required. Item title.
+        'custom_id'            => 0, // Optional. Any integer or non numeric id. Must be unique within item type.
+        'price'                => '0.00', // Optional. Item price. Default '0.00'.
+        'status'               => 'pending', // Optional. pending, publish
+        'custom_name'          => '', // Optional. Plural sub title for item.
+        'custom_singular_name' => '', // Optional. Singular sub title for item.
+        'vat_rule'             => 'digital', // Optional. digital => Digital item, physical => Physical item
+        'editable'             => true, // Optional. Item editable from Items list page? Default true.
+        'excerpt'              => '', // Optional. Item short description
         /* Recurring item fields */
-        'is_recurring'         => 0,                                                       // Optional. 1 => Allow recurring or 0 => Don't allow recurring
-        'recurring_period'     => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'recurring_interval'   => 0,                                                       // Optional. Integer value between 1 - 90.
-        'recurring_limit'      => 0,                                                       // Optional. Any integer number. 0 for recurring forever until cancelled.
-        'free_trial'           => 0,                                                       // Optional. 1 => Allow free trial or 0 => Don't free trial
-        'trial_period'         => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'trial_interval'       => 0,                                                       // Optional. Any integer number.
+        'is_recurring'         => 0, // Optional. 1 => Allow recurring or 0 => Don't allow recurring
+        'recurring_period'     => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'recurring_interval'   => 0, // Optional. Integer value between 1 - 90.
+        'recurring_limit'      => 0, // Optional. Any integer number. 0 for recurring forever until cancelled.
+        'free_trial'           => 0, // Optional. 1 => Allow free trial or 0 => Don't free trial
+        'trial_period'         => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'trial_interval'       => 0, // Optional. Any integer number.
     );
 
-    $data = wp_parse_args( $args, $defaults );
+    $data = wp_parse_args($args, $defaults);
 
-    if ( empty( $data['type'] ) ) {
+    if (empty($data['type'])) {
         $data['type'] = 'custom';
     }
 
-    if ( !empty( $data['custom_id'] ) ) {
-        $item = wpinv_get_item_by( 'custom_id', $data['custom_id'], $data['type'] );
+    if (!empty($data['custom_id'])) {
+        $item = wpinv_get_item_by('custom_id', $data['custom_id'], $data['type']);
     } else {
         $item = NULL;
     }
 
-    if ( !empty( $item ) ) {
-        if ( $force_update ) {
-            if ( empty( $args['ID'] ) ) {
+    if (!empty($item)) {
+        if ($force_update) {
+            if (empty($args['ID'])) {
                 $args['ID'] = $item->ID;
             }
-            return wpinv_update_item( $args, $wp_error );
+            return wpinv_update_item($args, $wp_error);
         }
 
         return $item;
@@ -710,19 +710,19 @@ 
     $meta['custom_id']              = $data['custom_id'];
     $meta['custom_singular_name']   = $data['custom_singular_name'];
     $meta['custom_name']            = $data['custom_name'];
-    $meta['price']                  = wpinv_round_amount( $data['price'] );
+    $meta['price']                  = wpinv_round_amount($data['price']);
     $meta['editable']               = (int)$data['editable'];
     $meta['vat_rule']               = $data['vat_rule'];
     $meta['vat_class']              = '_standard';
     
-    if ( !empty( $data['is_recurring'] ) ) {
+    if (!empty($data['is_recurring'])) {
         $meta['is_recurring']       = $data['is_recurring'];
         $meta['recurring_period']   = $data['recurring_period'];
-        $meta['recurring_interval'] = absint( $data['recurring_interval'] );
-        $meta['recurring_limit']    = absint( $data['recurring_limit'] );
+        $meta['recurring_interval'] = absint($data['recurring_interval']);
+        $meta['recurring_limit']    = absint($data['recurring_limit']);
         $meta['free_trial']         = $data['free_trial'];
         $meta['trial_period']       = $data['trial_period'];
-        $meta['trial_interval']     = absint( $data['trial_interval'] );
+        $meta['trial_interval']     = absint($data['trial_interval']);
     } else {
         $meta['is_recurring']       = 0;
         $meta['recurring_period']   = '';
@@ -733,7 +733,7 @@ 
         $meta['trial_interval']     = '';
     }
     
-    $post_data  = array( 
+    $post_data = array( 
         'post_title'    => $data['title'],
         'post_excerpt'  => $data['excerpt'],
         'post_status'   => $data['status'],
@@ -741,89 +741,89 @@ 
     );
 
     $item = new WPInv_Item();
-    $return = $item->create( $post_data, $wp_error );
+    $return = $item->create($post_data, $wp_error);
 
-    if ( $return && !empty( $item ) && !is_wp_error( $return ) ) {
+    if ($return && !empty($item) && !is_wp_error($return)) {
         return $item;
     }
 
-    if ( $wp_error && is_wp_error( $return ) ) {
+    if ($wp_error && is_wp_error($return)) {
         return $return;
     }
     return 0;
 }
 
-function wpinv_update_item( $args = array(), $wp_error = false ) {
-    $item = !empty( $args['ID'] ) ? new WPInv_Item( $args['ID'] ) : NULL;
+function wpinv_update_item($args = array(), $wp_error = false) {
+    $item = !empty($args['ID']) ? new WPInv_Item($args['ID']) : NULL;
 
-    if ( empty( $item ) || !( !empty( $item->post_type ) && $item->post_type == 'wpi_item' ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'wpinv_invalid_item', __( 'Invalid item.', 'invoicing' ) );
+    if (empty($item) || !(!empty($item->post_type) && $item->post_type == 'wpi_item')) {
+        if ($wp_error) {
+            return new WP_Error('wpinv_invalid_item', __('Invalid item.', 'invoicing'));
         }
         return 0;
     }
     
-    if ( !empty( $args['custom_id'] ) ) {
-        $item_exists = wpinv_get_item_by( 'custom_id', $args['custom_id'], ( !empty( $args['type'] ) ? $args['type'] : $item->type ) );
+    if (!empty($args['custom_id'])) {
+        $item_exists = wpinv_get_item_by('custom_id', $args['custom_id'], (!empty($args['type']) ? $args['type'] : $item->type));
         
-        if ( !empty( $item_exists ) && $item_exists->ID != $args['ID'] ) {
-            if ( $wp_error ) {
-                return new WP_Error( 'wpinv_invalid_custom_id', __( 'Item with custom id already exists.', 'invoicing' ) );
+        if (!empty($item_exists) && $item_exists->ID != $args['ID']) {
+            if ($wp_error) {
+                return new WP_Error('wpinv_invalid_custom_id', __('Item with custom id already exists.', 'invoicing'));
             }
             return 0;
         }
     }
 
-    $meta_fields = array( 'type', 'custom_id', 'custom_singular_name', 'custom_name', 'price', 'editable', 'vat_rule', 'vat_class', 'is_recurring', 'recurring_period', 'recurring_interval', 'recurring_limit', 'free_trial', 'trial_period', 'trial_interval' );
+    $meta_fields = array('type', 'custom_id', 'custom_singular_name', 'custom_name', 'price', 'editable', 'vat_rule', 'vat_class', 'is_recurring', 'recurring_period', 'recurring_interval', 'recurring_limit', 'free_trial', 'trial_period', 'trial_interval');
 
     $post_data = array();
-    if ( isset( $args['title'] ) ) { 
+    if (isset($args['title'])) { 
         $post_data['post_title'] = $args['title'];
     }
-    if ( isset( $args['excerpt'] ) ) { 
+    if (isset($args['excerpt'])) { 
         $post_data['post_excerpt'] = $args['excerpt'];
     }
-    if ( isset( $args['status'] ) ) { 
+    if (isset($args['status'])) { 
         $post_data['post_status'] = $args['status'];
     }
     
-    foreach ( $meta_fields as $meta_field ) {
-        if ( isset( $args[ $meta_field ] ) ) { 
-            $value = $args[ $meta_field ];
+    foreach ($meta_fields as $meta_field) {
+        if (isset($args[$meta_field])) { 
+            $value = $args[$meta_field];
 
-            switch ( $meta_field ) {
+            switch ($meta_field) {
                 case 'price':
-                    $value = wpinv_round_amount( $value );
+                    $value = wpinv_round_amount($value);
                 break;
                 case 'recurring_interval':
                 case 'recurring_limit':
                 case 'trial_interval':
-                    $value = absint( $value );
+                    $value = absint($value);
                 break;
 				case 'editable':
-                    $value = (int) $value;
+                    $value = (int)$value;
                 break;
             }
 
-            $post_data['meta'][ $meta_field ] = $value;
+            $post_data['meta'][$meta_field] = $value;
         };
     }
 
-    if ( empty( $post_data ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'wpinv_invalid_item_data', __( 'Invalid item data.', 'invoicing' ) );
+    if (empty($post_data)) {
+        if ($wp_error) {
+            return new WP_Error('wpinv_invalid_item_data', __('Invalid item data.', 'invoicing'));
         }
         return 0;
     }
     $post_data['ID'] = $args['ID'];
 
-    $return = $item->update( $post_data, $wp_error );
+    $return = $item->update($post_data, $wp_error);
 
-    if ( $return && !empty( $item ) && !is_wp_error( $return ) ) {
+    if ($return && !empty($item) && !is_wp_error($return)) {
         return $item;
     }
 
-    if ( $wp_error && is_wp_error( $return ) ) {
+    if ($wp_error && is_wp_error($return)) {
         return $return;
     }
     return 0;

includes/wpinv-invoice-functions.php

Braces +21 added lines, -16 removed lines

@@ -83,8 +83,9 @@ 
 
     $invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = %s LIMIT 1", $key ) );
 
-    if ( $invoice_id != NULL )
-        return $invoice_id;
+    if ( $invoice_id != NULL ) {
+            return $invoice_id;
+    }
 
     return 0;
 }
@@ -750,8 +751,9 @@ 
 function wpinv_checkout_validate_cc_zip( $zip = 0, $country_code = '' ) {
     $ret = false;
 
-    if ( empty( $zip ) || empty( $country_code ) )
-        return $ret;
+    if ( empty( $zip ) || empty( $country_code ) ) {
+            return $ret;
+    }
 
     $country_code = strtoupper( $country_code );
 
@@ -913,8 +915,9 @@ 
         "ZM" => "\d{5}"
     );
 
-    if ( ! isset ( $zip_regex[ $country_code ] ) || preg_match( "/" . $zip_regex[ $country_code ] . "/i", $zip ) )
-        $ret = true;
+    if ( ! isset ( $zip_regex[ $country_code ] ) || preg_match( "/" . $zip_regex[ $country_code ] . "/i", $zip ) ) {
+            $ret = true;
+    }
 
     return apply_filters( 'wpinv_is_zip_valid', $ret, $zip, $country_code );
 }
@@ -1238,14 +1241,15 @@ 
         }
     }
     
-    if ( get_query_var( 'paged' ) )
-        $args['page'] = get_query_var('paged');
-    else if ( get_query_var( 'page' ) )
-        $args['page'] = get_query_var( 'page' );
-    else if ( !empty( $args[ 'page' ] ) )
-        $args['page'] = $args[ 'page' ];
-    else
-        $args['page'] = 1;
+    if ( get_query_var( 'paged' ) ) {
+            $args['page'] = get_query_var('paged');
+    } else if ( get_query_var( 'page' ) ) {
+            $args['page'] = get_query_var( 'page' );
+    } else if ( !empty( $args[ 'page' ] ) ) {
+            $args['page'] = $args[ 'page' ];
+    } else {
+            $args['page'] = 1;
+    }
 
     /**
      * Generate WP_Query args. This logic will change if orders are moved to
@@ -1380,8 +1384,9 @@ 
 
 	$invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
 
-	if ( $invoice_id != NULL )
-		return $invoice_id;
+	if ( $invoice_id != NULL ) {
+			return $invoice_id;
+	}
 
 	return 0;
 }

Doc Comments +12 added lines

@@ -488,6 +488,9 @@ 
     return $invoice->get_description();
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_invoice_currency_code( $invoice_id = 0 ) {
     $invoice = new WPInv_Invoice( $invoice_id );
     return $invoice->get_currency();
@@ -521,6 +524,9 @@ 
     return $invoice->get_gateway_title();
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_payment_transaction_id( $invoice_id ) {
     $invoice = new WPInv_Invoice( $invoice_id );
     
@@ -616,6 +622,9 @@ 
     return $invoice->get_total( $currency );
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_date_created( $invoice_id = 0, $format = '' ) {
     $invoice = new WPInv_Invoice( $invoice_id );
 
@@ -626,6 +635,9 @@ 
     return $date_created;
 }
 
+/**
+ * @return string
+ */
 function wpinv_get_invoice_date( $invoice_id = 0, $format = '', $default = true ) {
     $invoice = new WPInv_Invoice( $invoice_id );
     

Indentation +70 added lines, -70 removed lines

@@ -669,7 +669,7 @@ 
 }
 
 function wpinv_get_payment_key( $invoice_id = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice( $invoice_id );
     return $invoice->get_key();
 }
 
@@ -919,7 +919,7 @@ 
         return false;
     }
     $invoice = wpinv_get_invoice_cart();
-	if ( empty( $invoice ) ) {
+    if ( empty( $invoice ) ) {
         return false;
     }
 
@@ -1216,20 +1216,20 @@ 
 }
 
 function wpinv_checkout_get_cc_info() {
-	$cc_info = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
-	$cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
-	$cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
-	$cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
-
-	// Return cc info
-	return $cc_info;
+    $cc_info = array();
+    $cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
+    $cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
+    $cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
+    $cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
+    $cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
+    $cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
+    $cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
+    $cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
+    $cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
+    $cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
+
+    // Return cc info
+    return $cc_info;
 }
 
 function wpinv_checkout_validate_cc_zip( $zip = 0, $country_code = '' ) {
@@ -1436,7 +1436,7 @@ 
         $required_fields  = wpinv_checkout_required_fields();
 
         // Loop through required fields and show error messages
-         if ( !empty( $required_fields ) ) {
+            if ( !empty( $required_fields ) ) {
             foreach ( $required_fields as $field_name => $value ) {
                 if ( in_array( $value, $required_fields ) && empty( $_POST[ 'wpinv_' . $field_name ] ) ) {
                     wpinv_set_error( $value['error_id'], $value['error_message'] );
@@ -1539,7 +1539,7 @@ 
 }
 
 function wpinv_get_checkout_session() {
-	global $wpi_session;
+    global $wpi_session;
     
     return $wpi_session->get( 'wpinv_checkout' );
 }
@@ -1620,7 +1620,7 @@ 
         $response['data']['taxf']       = $invoice->get_tax( true );
         $response['data']['total']      = $invoice->get_total();
         $response['data']['totalf']     = $invoice->get_total( true );
-	    $response['data']['free']       = $invoice->is_free() && ( ! ( (float) $response['data']['total'] > 0 ) || $invoice->is_free_trial() ) ? true : false;
+        $response['data']['free']       = $invoice->is_free() && ( ! ( (float) $response['data']['total'] > 0 ) || $invoice->is_free_trial() ) ? true : false;
 
         wp_send_json( $response );
     }
@@ -1905,57 +1905,57 @@ 
 }
 
 function wpinv_get_invoice_id_by_key( $key ) {
-	global $wpdb;
+    global $wpdb;
 
-	$invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
+    $invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
 
-	if ( $invoice_id != NULL )
-		return $invoice_id;
+    if ( $invoice_id != NULL )
+        return $invoice_id;
 
-	return 0;
+    return 0;
 }
 
 function wpinv_can_view_receipt( $invoice_key = '' ) {
-	$return = false;
+    $return = false;
 
-	if ( empty( $invoice_key ) ) {
-		return $return;
-	}
+    if ( empty( $invoice_key ) ) {
+        return $return;
+    }
 
-	global $wpinv_receipt_args;
+    global $wpinv_receipt_args;
 
-	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
-	if ( isset( $_GET['invoice-id'] ) ) {
-		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
-	}
+    $wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
+    if ( isset( $_GET['invoice-id'] ) ) {
+        $wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
+    }
 
-	if ( empty( $wpinv_receipt_args['id'] ) ) {
-		return $return;
-	}
+    if ( empty( $wpinv_receipt_args['id'] ) ) {
+        return $return;
+    }
 
-	$invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
-	if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
-		return $return;
-	}
+    $invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
+    if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
+        return $return;
+    }
 
-	if ( is_user_logged_in() ) {
-		if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
-			$return = true;
-		}
-	}
+    if ( is_user_logged_in() ) {
+        if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
+            $return = true;
+        }
+    }
 
-	$session = wpinv_get_checkout_session();
-	if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
-		$check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
+    $session = wpinv_get_checkout_session();
+    if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
+        $check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
 
-		if ( wpinv_require_login_to_checkout() ) {
-			$return = $return && $check_key === $invoice_key;
-		} else {
-			$return = $check_key === $invoice_key;
-		}
-	}
+        if ( wpinv_require_login_to_checkout() ) {
+            $return = $return && $check_key === $invoice_key;
+        } else {
+            $return = $check_key === $invoice_key;
+        }
+    }
 
-	return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
+    return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
 }
 
 function wpinv_pay_for_invoice() {
@@ -2263,14 +2263,14 @@ 
 
     if ( isset( $_GET['invoice_key'] ) || is_singular( 'wpi_invoice' ) || is_singular( 'wpi_quote' ) ) {
         $invoice_key = isset( $_GET['invoice_key'] ) ? urldecode($_GET['invoice_key']) : '';
-	    global $post;
+        global $post;
 
         if(!empty($invoice_key)){
-	        $invoice_id = wpinv_get_invoice_id_by_key($invoice_key);
+            $invoice_id = wpinv_get_invoice_id_by_key($invoice_key);
         } else if(!empty( $post ) && ($post->post_type == 'wpi_invoice' || $post->post_type == 'wpi_quote')) {
-			$invoice_id = $post->ID;
+            $invoice_id = $post->ID;
         } else {
-        	return;
+            return;
         }
 
         $invoice = new WPInv_Invoice($invoice_id);
@@ -2279,17 +2279,17 @@ 
             return;
         }
 
-	    if ( is_user_logged_in() ) {
-		    if ( (int)$invoice->get_user_id() === get_current_user_id() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    }
-	    } else {
-		    if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    }
-	    }
+        if ( is_user_logged_in() ) {
+            if ( (int)$invoice->get_user_id() === get_current_user_id() ) {
+                update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+            } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+            }
+        } else {
+            if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+            }
+        }
     }
 
 }

Spacing +758 added lines, -758 removed lines

@@ -7,40 +7,40 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_get_invoice_cart_id() {
     $wpinv_checkout = wpinv_get_checkout_session();
     
-    if ( !empty( $wpinv_checkout['invoice_id'] ) ) {
+    if (!empty($wpinv_checkout['invoice_id'])) {
         return $wpinv_checkout['invoice_id'];
     }
     
     return NULL;
 }
 
-function wpinv_insert_invoice( $invoice_data = array(), $wp_error = false ) {
-    if ( empty( $invoice_data ) ) {
+function wpinv_insert_invoice($invoice_data = array(), $wp_error = false) {
+    if (empty($invoice_data)) {
         return false;
     }
     
-    if ( !( !empty( $invoice_data['cart_details'] ) && is_array( $invoice_data['cart_details'] ) ) ) {
-        return $wp_error ? new WP_Error( 'wpinv_invalid_items', __( 'Invoice must have atleast on item.', 'invoicing' ) ) : 0;
+    if (!(!empty($invoice_data['cart_details']) && is_array($invoice_data['cart_details']))) {
+        return $wp_error ? new WP_Error('wpinv_invalid_items', __('Invoice must have atleast on item.', 'invoicing')) : 0;
     }
     
-    if ( empty( $invoice_data['user_id'] ) ) {
+    if (empty($invoice_data['user_id'])) {
         $invoice_data['user_id'] = get_current_user_id();
     }
     
-    $invoice_data['invoice_id'] = !empty( $invoice_data['invoice_id'] ) ? (int)$invoice_data['invoice_id'] : 0;
+    $invoice_data['invoice_id'] = !empty($invoice_data['invoice_id']) ? (int)$invoice_data['invoice_id'] : 0;
     
-    if ( empty( $invoice_data['status'] ) ) {
+    if (empty($invoice_data['status'])) {
         $invoice_data['status'] = 'wpi-pending';
     }
     
-    if ( empty( $invoice_data['ip'] ) ) {
+    if (empty($invoice_data['ip'])) {
         $invoice_data['ip'] = wpinv_get_ip();
     }
 
@@ -51,12 +51,12 @@ 
         'status'        => $invoice_data['status'],
     );
 
-    $invoice = wpinv_create_invoice( $default_args, $invoice_data, true );
-    if ( is_wp_error( $invoice ) ) {
+    $invoice = wpinv_create_invoice($default_args, $invoice_data, true);
+    if (is_wp_error($invoice)) {
         return $wp_error ? $invoice : 0;
     }
     
-    if ( empty( $invoice_data['invoice_id'] ) ) {
+    if (empty($invoice_data['invoice_id'])) {
         //$invoice->add_note( wp_sprintf( __( 'Invoice is created with status %s.', 'invoicing' ), wpinv_status_nicename( $invoice->status ) ) );
     }
     
@@ -79,24 +79,24 @@ 
         'discount'              => array(),
     );
 
-    if ( $user_id = (int)$invoice->get_user_id() ) {
-        if ( $user_address = wpinv_get_user_address( $user_id ) ) {
-            $default_user_info = wp_parse_args( $user_address, $default_user_info );
+    if ($user_id = (int)$invoice->get_user_id()) {
+        if ($user_address = wpinv_get_user_address($user_id)) {
+            $default_user_info = wp_parse_args($user_address, $default_user_info);
         }
     }
     
-    if ( empty( $invoice_data['user_info'] ) ) {
+    if (empty($invoice_data['user_info'])) {
         $invoice_data['user_info'] = array();
     }
     
-    $user_info = wp_parse_args( $invoice_data['user_info'], $default_user_info );
+    $user_info = wp_parse_args($invoice_data['user_info'], $default_user_info);
     
-    if ( empty( $user_info['first_name'] ) ) {
+    if (empty($user_info['first_name'])) {
         $user_info['first_name'] = $default_user_info['first_name'];
         $user_info['last_name'] = $default_user_info['last_name'];
     }
     
-    if ( empty( $user_info['country'] ) ) {
+    if (empty($user_info['country'])) {
         $user_info['country'] = $default_user_info['country'];
         $user_info['state'] = $default_user_info['state'];
         $user_info['city'] = $default_user_info['city'];
@@ -105,13 +105,13 @@ 
         $user_info['phone'] = $default_user_info['phone'];
     }
     
-    if ( !empty( $user_info['discount'] ) && !is_array( $user_info['discount'] ) ) {
+    if (!empty($user_info['discount']) && !is_array($user_info['discount'])) {
         $user_info['discount'] = (array)$user_info['discount'];
     }
 
     // Payment details
     $payment_details = array();
-    if ( !empty( $invoice_data['payment_details'] ) ) {
+    if (!empty($invoice_data['payment_details'])) {
         $default_payment_details = array(
             'gateway'           => 'manual',
             'gateway_title'     => '',
@@ -119,56 +119,56 @@ 
             'transaction_id'    => '',
         );
         
-        $payment_details = wp_parse_args( $invoice_data['payment_details'], $default_payment_details );
+        $payment_details = wp_parse_args($invoice_data['payment_details'], $default_payment_details);
         
-        if ( empty( $payment_details['gateway'] ) ) {
+        if (empty($payment_details['gateway'])) {
             $payment_details['gateway'] = 'manual';
         }
         
-        if ( empty( $payment_details['currency'] ) ) {
+        if (empty($payment_details['currency'])) {
             $payment_details['currency'] = wpinv_get_default_country();
         }
         
-        if ( empty( $payment_details['gateway_title'] ) ) {
-            $payment_details['gateway_title'] = wpinv_get_gateway_checkout_label( $payment_details['gateway'] );
+        if (empty($payment_details['gateway_title'])) {
+            $payment_details['gateway_title'] = wpinv_get_gateway_checkout_label($payment_details['gateway']);
         }
     }
     
-    $invoice->set( 'status', ( !empty( $invoice_data['status'] ) ? $invoice_data['status'] : 'wpi-pending' ) );
-    
-    if ( !empty( $payment_details ) ) {
-        $invoice->set( 'currency', $payment_details['currency'] );
-        $invoice->set( 'gateway', $payment_details['gateway'] );
-        $invoice->set( 'gateway_title', $payment_details['gateway_title'] );
-        $invoice->set( 'transaction_id', $payment_details['transaction_id'] );
-    }
-    
-    $invoice->set( 'user_info', $user_info );
-    $invoice->set( 'first_name', $user_info['first_name'] );
-    $invoice->set( 'last_name', $user_info['last_name'] );
-    $invoice->set( 'address', $user_info['address'] );
-    $invoice->set( 'company', $user_info['company'] );
-    $invoice->set( 'vat_number', $user_info['vat_number'] );
-    $invoice->set( 'phone', $user_info['phone'] );
-    $invoice->set( 'city', $user_info['city'] );
-    $invoice->set( 'country', $user_info['country'] );
-    $invoice->set( 'state', $user_info['state'] );
-    $invoice->set( 'zip', $user_info['zip'] );
-    $invoice->set( 'discounts', $user_info['discount'] );
-    $invoice->set( 'ip', ( !empty( $invoice_data['ip'] ) ? $invoice_data['ip'] : wpinv_get_ip() ) );
-    $invoice->set( 'mode', ( wpinv_is_test_mode() ? 'test' : 'live' ) );
-    $invoice->set( 'parent_invoice', ( !empty( $invoice_data['parent'] ) ? absint( $invoice_data['parent'] ) : '' ) );
-    
-    if ( !empty( $invoice_data['cart_details'] ) && is_array( $invoice_data['cart_details'] ) ) {
-        foreach ( $invoice_data['cart_details'] as $key => $item ) {
-            $item_id        = !empty( $item['id'] ) ? $item['id'] : 0;
-            $quantity       = !empty( $item['quantity'] ) ? $item['quantity'] : 1;
-            $name           = !empty( $item['name'] ) ? $item['name'] : '';
-            $item_price     = isset( $item['item_price'] ) ? $item['item_price'] : '';
+    $invoice->set('status', (!empty($invoice_data['status']) ? $invoice_data['status'] : 'wpi-pending'));
+    
+    if (!empty($payment_details)) {
+        $invoice->set('currency', $payment_details['currency']);
+        $invoice->set('gateway', $payment_details['gateway']);
+        $invoice->set('gateway_title', $payment_details['gateway_title']);
+        $invoice->set('transaction_id', $payment_details['transaction_id']);
+    }
+    
+    $invoice->set('user_info', $user_info);
+    $invoice->set('first_name', $user_info['first_name']);
+    $invoice->set('last_name', $user_info['last_name']);
+    $invoice->set('address', $user_info['address']);
+    $invoice->set('company', $user_info['company']);
+    $invoice->set('vat_number', $user_info['vat_number']);
+    $invoice->set('phone', $user_info['phone']);
+    $invoice->set('city', $user_info['city']);
+    $invoice->set('country', $user_info['country']);
+    $invoice->set('state', $user_info['state']);
+    $invoice->set('zip', $user_info['zip']);
+    $invoice->set('discounts', $user_info['discount']);
+    $invoice->set('ip', (!empty($invoice_data['ip']) ? $invoice_data['ip'] : wpinv_get_ip()));
+    $invoice->set('mode', (wpinv_is_test_mode() ? 'test' : 'live'));
+    $invoice->set('parent_invoice', (!empty($invoice_data['parent']) ? absint($invoice_data['parent']) : ''));
+    
+    if (!empty($invoice_data['cart_details']) && is_array($invoice_data['cart_details'])) {
+        foreach ($invoice_data['cart_details'] as $key => $item) {
+            $item_id        = !empty($item['id']) ? $item['id'] : 0;
+            $quantity       = !empty($item['quantity']) ? $item['quantity'] : 1;
+            $name           = !empty($item['name']) ? $item['name'] : '';
+            $item_price     = isset($item['item_price']) ? $item['item_price'] : '';
             
-            $post_item  = new WPInv_Item( $item_id );
-            if ( !empty( $post_item ) ) {
-                $name       = !empty( $name ) ? $name : $post_item->get_name();
+            $post_item = new WPInv_Item($item_id);
+            if (!empty($post_item)) {
+                $name       = !empty($name) ? $name : $post_item->get_name();
                 $item_price = $item_price !== '' ? $item_price : $post_item->get_price();
             } else {
                 continue;
@@ -178,253 +178,253 @@ 
                 'name'          => $name,
                 'quantity'      => $quantity,
                 'item_price'    => $item_price,
-                'custom_price'  => isset( $item['custom_price'] ) ? $item['custom_price'] : '',
-                'tax'           => !empty( $item['tax'] ) ? $item['tax'] : 0.00,
-                'discount'      => isset( $item['discount'] ) ? $item['discount'] : 0,
-                'meta'          => isset( $item['meta'] ) ? $item['meta'] : array(),
-                'fees'          => isset( $item['fees'] ) ? $item['fees'] : array(),
+                'custom_price'  => isset($item['custom_price']) ? $item['custom_price'] : '',
+                'tax'           => !empty($item['tax']) ? $item['tax'] : 0.00,
+                'discount'      => isset($item['discount']) ? $item['discount'] : 0,
+                'meta'          => isset($item['meta']) ? $item['meta'] : array(),
+                'fees'          => isset($item['fees']) ? $item['fees'] : array(),
             );
 
-            $invoice->add_item( $item_id, $args );
+            $invoice->add_item($item_id, $args);
         }
     }
 
-    $invoice->increase_tax( wpinv_get_cart_fee_tax() );
+    $invoice->increase_tax(wpinv_get_cart_fee_tax());
 
-    if ( isset( $invoice_data['post_date'] ) ) {
-        $invoice->set( 'date', $invoice_data['post_date'] );
+    if (isset($invoice_data['post_date'])) {
+        $invoice->set('date', $invoice_data['post_date']);
     }
     
     // Invoice due date
-    if ( isset( $invoice_data['due_date'] ) ) {
-        $invoice->set( 'due_date', $invoice_data['due_date'] );
+    if (isset($invoice_data['due_date'])) {
+        $invoice->set('due_date', $invoice_data['due_date']);
     }
     
     $invoice->save();
     
     // Add notes
-    if ( !empty( $invoice_data['private_note'] ) ) {
-        $invoice->add_note( $invoice_data['private_note'] );
+    if (!empty($invoice_data['private_note'])) {
+        $invoice->add_note($invoice_data['private_note']);
     }
-    if ( !empty( $invoice_data['user_note'] ) ) {
-        $invoice->add_note( $invoice_data['user_note'], true );
+    if (!empty($invoice_data['user_note'])) {
+        $invoice->add_note($invoice_data['user_note'], true);
     }
     
-    do_action( 'wpinv_insert_invoice', $invoice->ID, $invoice_data );
+    do_action('wpinv_insert_invoice', $invoice->ID, $invoice_data);
 
-    if ( ! empty( $invoice->ID ) ) {
+    if (!empty($invoice->ID)) {
         global $wpi_userID, $wpinv_ip_address_country;
         
         $checkout_session = wpinv_get_checkout_session();
         
         $data_session                   = array();
         $data_session['invoice_id']     = $invoice->ID;
-        $data_session['cart_discounts'] = $invoice->get_discounts( true );
+        $data_session['cart_discounts'] = $invoice->get_discounts(true);
         
-        wpinv_set_checkout_session( $data_session );
+        wpinv_set_checkout_session($data_session);
         
         $wpi_userID         = (int)$invoice->get_user_id();
         
-        $_POST['country']   = !empty( $invoice->country ) ? $invoice->country : wpinv_get_default_country();
+        $_POST['country']   = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
         $_POST['state']     = $invoice->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;
         
-        $invoice = $invoice->recalculate_totals( true );
+        $invoice = $invoice->recalculate_totals(true);
         
-        wpinv_set_checkout_session( $checkout_session );
+        wpinv_set_checkout_session($checkout_session);
                     
         return $invoice;
     }
     
-    if ( $wp_error ) {
-        if ( is_wp_error( $invoice ) ) {
+    if ($wp_error) {
+        if (is_wp_error($invoice)) {
             return $invoice;
         } else {
-            return new WP_Error( 'wpinv_insert_invoice_error', __( 'Error in insert invoice.', 'invoicing' ) );
+            return new WP_Error('wpinv_insert_invoice_error', __('Error in insert invoice.', 'invoicing'));
         }
     } else {
         return 0;
     }
 }
 
-function wpinv_update_invoice( $invoice_data = array(), $wp_error = false ) {
-    $invoice_ID = !empty( $invoice_data['ID'] ) ? absint( $invoice_data['ID'] ) : NULL;
+function wpinv_update_invoice($invoice_data = array(), $wp_error = false) {
+    $invoice_ID = !empty($invoice_data['ID']) ? absint($invoice_data['ID']) : NULL;
 
-    if ( !$invoice_ID ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'invalid_invoice_id', __( 'Invalid invoice ID.', 'invoicing' ) );
+    if (!$invoice_ID) {
+        if ($wp_error) {
+            return new WP_Error('invalid_invoice_id', __('Invalid invoice ID.', 'invoicing'));
         }
         return 0;
     }
 
-    $invoice = wpinv_get_invoice( $invoice_ID );
+    $invoice = wpinv_get_invoice($invoice_ID);
 
-    $recurring_item = $invoice->is_recurring() ? $invoice->get_recurring( true ) : NULL;
+    $recurring_item = $invoice->is_recurring() ? $invoice->get_recurring(true) : NULL;
 
-    if ( empty( $invoice->ID ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'invalid_invoice', __( 'Invalid invoice.', 'invoicing' ) );
+    if (empty($invoice->ID)) {
+        if ($wp_error) {
+            return new WP_Error('invalid_invoice', __('Invalid invoice.', 'invoicing'));
         }
         return 0;
     }
 
-    if ( !$invoice->has_status( array( 'wpi-pending' ) ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'invalid_invoice_status', __( 'Only invoice with pending payment is allowed to update.', 'invoicing' ) );
+    if (!$invoice->has_status(array('wpi-pending'))) {
+        if ($wp_error) {
+            return new WP_Error('invalid_invoice_status', __('Only invoice with pending payment is allowed to update.', 'invoicing'));
         }
         return 0;
     }
 
     // Invoice status
-    if ( !empty( $invoice_data['status'] ) ) {
-        $invoice->set( 'status', $invoice_data['status'] );
+    if (!empty($invoice_data['status'])) {
+        $invoice->set('status', $invoice_data['status']);
     }
 
     // Invoice date
-    if ( !empty( $invoice_data['post_date'] ) ) {
-        $invoice->set( 'date', $invoice_data['post_date'] );
+    if (!empty($invoice_data['post_date'])) {
+        $invoice->set('date', $invoice_data['post_date']);
     }
 
     // Invoice due date
-    if ( isset( $invoice_data['due_date'] ) ) {
-        $invoice->set( 'due_date', $invoice_data['due_date'] );
+    if (isset($invoice_data['due_date'])) {
+        $invoice->set('due_date', $invoice_data['due_date']);
     }
 
     // Invoice IP address
-    if ( !empty( $invoice_data['ip'] ) ) {
-        $invoice->set( 'ip', $invoice_data['ip'] );
+    if (!empty($invoice_data['ip'])) {
+        $invoice->set('ip', $invoice_data['ip']);
     }
     
     // User info
-    if ( !empty( $invoice_data['user_info'] ) && is_array( $invoice_data['user_info'] ) ) {
-        $user_info = wp_parse_args( $invoice_data['user_info'], $invoice->user_info );
+    if (!empty($invoice_data['user_info']) && is_array($invoice_data['user_info'])) {
+        $user_info = wp_parse_args($invoice_data['user_info'], $invoice->user_info);
 
-        if ( $discounts = $invoice->get_discounts() ) {
+        if ($discounts = $invoice->get_discounts()) {
             $set_discount = $discounts;
         } else {
             $set_discount = '';
         }
 
         // Manage discount
-        if ( !empty( $invoice_data['user_info']['discount'] ) ) {
+        if (!empty($invoice_data['user_info']['discount'])) {
             // Remove discount
-            if ( $invoice_data['user_info']['discount'] == 'none' ) {
+            if ($invoice_data['user_info']['discount'] == 'none') {
                 $set_discount = '';
             } else {
                 $set_discount = $invoice_data['user_info']['discount'];
             }
 
-            $invoice->set( 'discounts', $set_discount );
+            $invoice->set('discounts', $set_discount);
         }
 
         $user_info['discount'] = $set_discount;
 
-        $invoice->set( 'user_info', $user_info );
+        $invoice->set('user_info', $user_info);
     }
 
-    if ( !empty( $invoice_data['cart_details'] ) && is_array( $invoice_data['cart_details'] ) && $cart_details = $invoice_data['cart_details'] ) {
-        $remove_items = !empty( $cart_details['remove_items'] ) && is_array( $cart_details['remove_items'] ) ? $cart_details['remove_items'] : array();
+    if (!empty($invoice_data['cart_details']) && is_array($invoice_data['cart_details']) && $cart_details = $invoice_data['cart_details']) {
+        $remove_items = !empty($cart_details['remove_items']) && is_array($cart_details['remove_items']) ? $cart_details['remove_items'] : array();
 
-        if ( !empty( $remove_items[0]['id'] ) ) {
-            foreach ( $remove_items as $item ) {
-                $item_id        = !empty( $item['id'] ) ? $item['id'] : 0;
-                $quantity       = !empty( $item['quantity'] ) ? $item['quantity'] : 1;
-                if ( empty( $item_id ) ) {
+        if (!empty($remove_items[0]['id'])) {
+            foreach ($remove_items as $item) {
+                $item_id        = !empty($item['id']) ? $item['id'] : 0;
+                $quantity       = !empty($item['quantity']) ? $item['quantity'] : 1;
+                if (empty($item_id)) {
                     continue;
                 }
 
-                foreach ( $invoice->cart_details as $cart_index => $cart_item ) {
-                    if ( $item_id == $cart_item['id'] ) {
+                foreach ($invoice->cart_details as $cart_index => $cart_item) {
+                    if ($item_id == $cart_item['id']) {
                         $args = array(
                             'id'         => $item_id,
                             'quantity'   => $quantity,
                             'cart_index' => $cart_index
                         );
 
-                        $invoice->remove_item( $item_id, $args );
+                        $invoice->remove_item($item_id, $args);
                         break;
                     }
                 }
             }
         }
 
-        $add_items = !empty( $cart_details['add_items'] ) && is_array( $cart_details['add_items'] ) ? $cart_details['add_items'] : array();
+        $add_items = !empty($cart_details['add_items']) && is_array($cart_details['add_items']) ? $cart_details['add_items'] : array();
 
-        if ( !empty( $add_items[0]['id'] ) ) {
-            foreach ( $add_items as $item ) {
-                $item_id        = !empty( $item['id'] ) ? $item['id'] : 0;
-                $post_item      = new WPInv_Item( $item_id );
-                if ( empty( $post_item ) ) {
+        if (!empty($add_items[0]['id'])) {
+            foreach ($add_items as $item) {
+                $item_id        = !empty($item['id']) ? $item['id'] : 0;
+                $post_item      = new WPInv_Item($item_id);
+                if (empty($post_item)) {
                     continue;
                 }
 
                 $valid_item = true;
-                if ( !empty( $recurring_item ) ) {
-                    if ( $recurring_item->ID != $item_id ) {
+                if (!empty($recurring_item)) {
+                    if ($recurring_item->ID != $item_id) {
                         $valid_item = false;
                     }
-                } else if ( wpinv_is_recurring_item( $item_id ) ) {
+                } else if (wpinv_is_recurring_item($item_id)) {
                     $valid_item = false;
                 }
                 
-                if ( !$valid_item ) {
-                    if ( $wp_error ) {
-                        return new WP_Error( 'invalid_invoice_item', __( 'You can not add item because recurring item must be paid individually!', 'invoicing' ) );
+                if (!$valid_item) {
+                    if ($wp_error) {
+                        return new WP_Error('invalid_invoice_item', __('You can not add item because recurring item must be paid individually!', 'invoicing'));
                     }
                     return 0;
                 }
 
-                $quantity       = !empty( $item['quantity'] ) ? $item['quantity'] : 1;
-                $name           = !empty( $item['name'] ) ? $item['name'] : $post_item->get_name();
-                $item_price     = isset( $item['item_price'] ) ? $item['item_price'] : $post_item->get_price();
+                $quantity       = !empty($item['quantity']) ? $item['quantity'] : 1;
+                $name           = !empty($item['name']) ? $item['name'] : $post_item->get_name();
+                $item_price     = isset($item['item_price']) ? $item['item_price'] : $post_item->get_price();
 
                 $args = array(
                     'name'          => $name,
                     'quantity'      => $quantity,
                     'item_price'    => $item_price,
-                    'custom_price'  => isset( $item['custom_price'] ) ? $item['custom_price'] : '',
-                    'tax'           => !empty( $item['tax'] ) ? $item['tax'] : 0,
-                    'discount'      => isset( $item['discount'] ) ? $item['discount'] : 0,
-                    'meta'          => isset( $item['meta'] ) ? $item['meta'] : array(),
-                    'fees'          => isset( $item['fees'] ) ? $item['fees'] : array(),
+                    'custom_price'  => isset($item['custom_price']) ? $item['custom_price'] : '',
+                    'tax'           => !empty($item['tax']) ? $item['tax'] : 0,
+                    'discount'      => isset($item['discount']) ? $item['discount'] : 0,
+                    'meta'          => isset($item['meta']) ? $item['meta'] : array(),
+                    'fees'          => isset($item['fees']) ? $item['fees'] : array(),
                 );
 
-                $invoice->add_item( $item_id, $args );
+                $invoice->add_item($item_id, $args);
             }
         }
     }
     
     // Payment details
-    if ( !empty( $invoice_data['payment_details'] ) && $payment_details = $invoice_data['payment_details'] ) {
-        if ( !empty( $payment_details['gateway'] ) ) {
-            $invoice->set( 'gateway', $payment_details['gateway'] );
+    if (!empty($invoice_data['payment_details']) && $payment_details = $invoice_data['payment_details']) {
+        if (!empty($payment_details['gateway'])) {
+            $invoice->set('gateway', $payment_details['gateway']);
         }
 
-        if ( !empty( $payment_details['transaction_id'] ) ) {
-            $invoice->set( 'transaction_id', $payment_details['transaction_id'] );
+        if (!empty($payment_details['transaction_id'])) {
+            $invoice->set('transaction_id', $payment_details['transaction_id']);
         }
     }
 
-    do_action( 'wpinv_pre_update_invoice', $invoice->ID, $invoice_data );
+    do_action('wpinv_pre_update_invoice', $invoice->ID, $invoice_data);
 
     // Parent invoice
-    if ( !empty( $invoice_data['parent'] ) ) {
-        $invoice->set( 'parent_invoice', $invoice_data['parent'] );
+    if (!empty($invoice_data['parent'])) {
+        $invoice->set('parent_invoice', $invoice_data['parent']);
     }
 
     // Save invoice data.
     $invoice->save();
     
-    if ( empty( $invoice->ID ) || is_wp_error( $invoice ) ) {
-        if ( $wp_error ) {
-            if ( is_wp_error( $invoice ) ) {
+    if (empty($invoice->ID) || is_wp_error($invoice)) {
+        if ($wp_error) {
+            if (is_wp_error($invoice)) {
                 return $invoice;
             } else {
-                return new WP_Error( 'wpinv_update_invoice_error', __( 'Error in update invoice.', 'invoicing' ) );
+                return new WP_Error('wpinv_update_invoice_error', __('Error in update invoice.', 'invoicing'));
             }
         } else {
             return 0;
@@ -432,13 +432,13 @@ 
     }
 
     // Add private note
-    if ( !empty( $invoice_data['private_note'] ) ) {
-        $invoice->add_note( $invoice_data['private_note'] );
+    if (!empty($invoice_data['private_note'])) {
+        $invoice->add_note($invoice_data['private_note']);
     }
 
     // Add user note
-    if ( !empty( $invoice_data['user_note'] ) ) {
-        $invoice->add_note( $invoice_data['user_note'], true );
+    if (!empty($invoice_data['user_note'])) {
+        $invoice->add_note($invoice_data['user_note'], true);
     }
 
     global $wpi_userID, $wpinv_ip_address_country;
@@ -447,450 +447,450 @@ 
 
     $data_session                   = array();
     $data_session['invoice_id']     = $invoice->ID;
-    $data_session['cart_discounts'] = $invoice->get_discounts( true );
+    $data_session['cart_discounts'] = $invoice->get_discounts(true);
 
-    wpinv_set_checkout_session( $data_session );
+    wpinv_set_checkout_session($data_session);
 
     $wpi_userID         = (int)$invoice->get_user_id();
 
-    $_POST['country']   = !empty( $invoice->country ) ? $invoice->country : wpinv_get_default_country();
+    $_POST['country']   = !empty($invoice->country) ? $invoice->country : wpinv_get_default_country();
     $_POST['state']     = $invoice->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;
 
-    $invoice = $invoice->recalculate_totals( true );
+    $invoice = $invoice->recalculate_totals(true);
 
-    do_action( 'wpinv_post_update_invoice', $invoice->ID, $invoice_data );
+    do_action('wpinv_post_update_invoice', $invoice->ID, $invoice_data);
 
-    wpinv_set_checkout_session( $checkout_session );
+    wpinv_set_checkout_session($checkout_session);
 
     return $invoice;
 }
 
-function wpinv_get_invoice( $invoice_id = 0, $cart = false ) {
-    if ( $cart && empty( $invoice_id ) ) {
+function wpinv_get_invoice($invoice_id = 0, $cart = false) {
+    if ($cart && empty($invoice_id)) {
         $invoice_id = (int)wpinv_get_invoice_cart_id();
     }
 
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    if ( ! empty( $invoice ) && ! empty( $invoice->ID ) ) {
+    if (!empty($invoice) && !empty($invoice->ID)) {
         return $invoice;
     }
     
     return NULL;
 }
 
-function wpinv_get_invoice_cart( $invoice_id = 0 ) {
-    return wpinv_get_invoice( $invoice_id, true );
+function wpinv_get_invoice_cart($invoice_id = 0) {
+    return wpinv_get_invoice($invoice_id, true);
 }
 
-function wpinv_get_invoice_description( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_description($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_description();
 }
 
-function wpinv_get_invoice_currency_code( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_currency_code($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_currency();
 }
 
-function wpinv_get_payment_user_email( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_user_email($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_email();
 }
 
-function wpinv_get_user_id( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_user_id($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_user_id();
 }
 
-function wpinv_get_invoice_status( $invoice_id, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_status($invoice_id, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    return $invoice->get_status( $return_label );
+    return $invoice->get_status($return_label);
 }
 
-function wpinv_get_payment_gateway( $invoice_id, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_gateway($invoice_id, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    return $invoice->get_gateway( $return_label );
+    return $invoice->get_gateway($return_label);
 }
 
-function wpinv_get_payment_gateway_name( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_gateway_name($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     return $invoice->get_gateway_title();
 }
 
-function wpinv_get_payment_transaction_id( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_transaction_id($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     return $invoice->get_transaction_id();
 }
 
-function wpinv_get_id_by_transaction_id( $key ) {
+function wpinv_get_id_by_transaction_id($key) {
     global $wpdb;
 
-    $invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = %s LIMIT 1", $key ) );
+    $invoice_id = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = %s LIMIT 1", $key));
 
-    if ( $invoice_id != NULL )
+    if ($invoice_id != NULL)
         return $invoice_id;
 
     return 0;
 }
 
-function wpinv_get_invoice_meta( $invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_meta($invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_meta( $meta_key, $single );
+    return $invoice->get_meta($meta_key, $single);
 }
 
-function wpinv_update_invoice_meta( $invoice_id = 0, $meta_key = '', $meta_value = '', $prev_value = '' ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_update_invoice_meta($invoice_id = 0, $meta_key = '', $meta_value = '', $prev_value = '') {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    return $invoice->update_meta( $meta_key, $meta_value, $prev_value );
+    return $invoice->update_meta($meta_key, $meta_value, $prev_value);
 }
 
-function wpinv_get_items( $invoice_id = 0 ) {
-    $invoice            = wpinv_get_invoice( $invoice_id );
+function wpinv_get_items($invoice_id = 0) {
+    $invoice            = wpinv_get_invoice($invoice_id);
     
     $items              = $invoice->get_items();
     $invoice_currency   = $invoice->get_currency();
 
-    if ( !empty( $items ) && is_array( $items ) ) {
-        foreach ( $items as $key => $item ) {
+    if (!empty($items) && is_array($items)) {
+        foreach ($items as $key => $item) {
             $items[$key]['currency'] = $invoice_currency;
 
-            if ( !isset( $cart_item['subtotal'] ) ) {
+            if (!isset($cart_item['subtotal'])) {
                 $items[$key]['subtotal'] = $items[$key]['amount'] * 1;
             }
         }
     }
 
-    return apply_filters( 'wpinv_get_items', $items, $invoice_id );
+    return apply_filters('wpinv_get_items', $items, $invoice_id);
 }
 
-function wpinv_get_fees( $invoice_id = 0 ) {
-    $invoice           = wpinv_get_invoice( $invoice_id );
+function wpinv_get_fees($invoice_id = 0) {
+    $invoice           = wpinv_get_invoice($invoice_id);
     $fees              = $invoice->get_fees();
 
-    return apply_filters( 'wpinv_get_fees', $fees, $invoice_id );
+    return apply_filters('wpinv_get_fees', $fees, $invoice_id);
 }
 
-function wpinv_get_invoice_ip( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_ip($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_ip();
 }
 
-function wpinv_get_invoice_user_info( $invoice_id ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_user_info($invoice_id) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_user_info();
 }
 
-function wpinv_subtotal( $invoice_id = 0, $currency = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_subtotal($invoice_id = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_subtotal( $currency );
+    return $invoice->get_subtotal($currency);
 }
 
-function wpinv_tax( $invoice_id = 0, $currency = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_tax($invoice_id = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_tax( $currency );
+    return $invoice->get_tax($currency);
 }
 
-function wpinv_discount( $invoice_id = 0, $currency = false, $dash = false ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_discount($invoice_id = 0, $currency = false, $dash = false) {
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    return $invoice->get_discount( $currency, $dash );
+    return $invoice->get_discount($currency, $dash);
 }
 
-function wpinv_discount_code( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_discount_code($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
     return $invoice->get_discount_code();
 }
 
-function wpinv_payment_total( $invoice_id = 0, $currency = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_payment_total($invoice_id = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->get_total( $currency );
+    return $invoice->get_total($currency);
 }
 
-function wpinv_get_date_created( $invoice_id = 0, $format = '' ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_date_created($invoice_id = 0, $format = '') {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    $format         = !empty( $format ) ? $format : get_option( 'date_format' );
+    $format         = !empty($format) ? $format : get_option('date_format');
     $date_created   = $invoice->get_created_date();
-    $date_created   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n( $format, strtotime( $date_created ) ) : '';
+    $date_created   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n($format, strtotime($date_created)) : '';
 
     return $date_created;
 }
 
-function wpinv_get_invoice_date( $invoice_id = 0, $format = '', $default = true ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_date($invoice_id = 0, $format = '', $default = true) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
-    $format         = !empty( $format ) ? $format : get_option( 'date_format' );
+    $format         = !empty($format) ? $format : get_option('date_format');
     $date_completed = $invoice->get_completed_date();
-    $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n( $format, strtotime( $date_completed ) ) : '';
-    if ( $invoice_date == '' && $default ) {
-        $invoice_date   = wpinv_get_date_created( $invoice_id, $format );
+    $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n($format, strtotime($date_completed)) : '';
+    if ($invoice_date == '' && $default) {
+        $invoice_date = wpinv_get_date_created($invoice_id, $format);
     }
 
     return $invoice_date;
 }
 
-function wpinv_get_invoice_vat_number( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_vat_number($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     
     return $invoice->vat_number;
 }
 
-function wpinv_insert_payment_note( $invoice_id = 0, $note = '', $user_type = false, $added_by_user = false, $system = false ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_insert_payment_note($invoice_id = 0, $note = '', $user_type = false, $added_by_user = false, $system = false) {
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    return $invoice->add_note( $note, $user_type, $added_by_user, $system );
+    return $invoice->add_note($note, $user_type, $added_by_user, $system);
 }
 
-function wpinv_get_invoice_notes( $invoice_id = 0, $type = '' ) {
+function wpinv_get_invoice_notes($invoice_id = 0, $type = '') {
     global $invoicing;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return NULL;
     }
     
-    $notes = $invoicing->notes->get_invoice_notes( $invoice_id, $type );
+    $notes = $invoicing->notes->get_invoice_notes($invoice_id, $type);
     
-    return apply_filters( 'wpinv_invoice_notes', $notes, $invoice_id, $type );
+    return apply_filters('wpinv_invoice_notes', $notes, $invoice_id, $type);
 }
 
-function wpinv_get_payment_key( $invoice_id = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_payment_key($invoice_id = 0) {
+	$invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_key();
 }
 
-function wpinv_get_invoice_number( $invoice_id = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
+function wpinv_get_invoice_number($invoice_id = 0) {
+    $invoice = new WPInv_Invoice($invoice_id);
     return $invoice->get_number();
 }
 
-function wpinv_get_cart_discountable_subtotal( $code_id ) {
+function wpinv_get_cart_discountable_subtotal($code_id) {
     $cart_items = wpinv_get_cart_content_details();
     $items      = array();
 
-    $excluded_items = wpinv_get_discount_excluded_items( $code_id );
+    $excluded_items = wpinv_get_discount_excluded_items($code_id);
 
-    if( $cart_items ) {
+    if ($cart_items) {
 
-        foreach( $cart_items as $item ) {
+        foreach ($cart_items as $item) {
 
-            if( ! in_array( $item['id'], $excluded_items ) ) {
-                $items[] =  $item;
+            if (!in_array($item['id'], $excluded_items)) {
+                $items[] = $item;
             }
         }
     }
 
-    $subtotal = wpinv_get_cart_items_subtotal( $items );
+    $subtotal = wpinv_get_cart_items_subtotal($items);
 
-    return apply_filters( 'wpinv_get_cart_discountable_subtotal', $subtotal );
+    return apply_filters('wpinv_get_cart_discountable_subtotal', $subtotal);
 }
 
-function wpinv_get_cart_items_subtotal( $items ) {
+function wpinv_get_cart_items_subtotal($items) {
     $subtotal = 0.00;
 
-    if ( is_array( $items ) && ! empty( $items ) ) {
-        $prices = wp_list_pluck( $items, 'subtotal' );
+    if (is_array($items) && !empty($items)) {
+        $prices = wp_list_pluck($items, 'subtotal');
 
-        if( is_array( $prices ) ) {
-            $subtotal = array_sum( $prices );
+        if (is_array($prices)) {
+            $subtotal = array_sum($prices);
         } else {
             $subtotal = 0.00;
         }
 
-        if( $subtotal < 0 ) {
+        if ($subtotal < 0) {
             $subtotal = 0.00;
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_items_subtotal', $subtotal );
+    return apply_filters('wpinv_get_cart_items_subtotal', $subtotal);
 }
 
-function wpinv_get_cart_subtotal( $items = array() ) {
-    $items    = !empty( $items ) ? $items : wpinv_get_cart_content_details();
-    $subtotal = wpinv_get_cart_items_subtotal( $items );
+function wpinv_get_cart_subtotal($items = array()) {
+    $items    = !empty($items) ? $items : wpinv_get_cart_content_details();
+    $subtotal = wpinv_get_cart_items_subtotal($items);
 
-    return apply_filters( 'wpinv_get_cart_subtotal', $subtotal );
+    return apply_filters('wpinv_get_cart_subtotal', $subtotal);
 }
 
-function wpinv_cart_subtotal( $items = array() ) {
-    $price = wpinv_price( wpinv_format_amount( wpinv_get_cart_subtotal( $items ) ) );
+function wpinv_cart_subtotal($items = array()) {
+    $price = wpinv_price(wpinv_format_amount(wpinv_get_cart_subtotal($items)));
 
     return $price;
 }
 
-function wpinv_get_cart_total( $items = array(), $discounts = false, $invoice = array() ) {
-    $subtotal  = (float)wpinv_get_cart_subtotal( $items );
-    $discounts = (float)wpinv_get_cart_discounted_amount( $items );
-    $cart_tax  = (float)wpinv_get_cart_tax( $items );
+function wpinv_get_cart_total($items = array(), $discounts = false, $invoice = array()) {
+    $subtotal  = (float)wpinv_get_cart_subtotal($items);
+    $discounts = (float)wpinv_get_cart_discounted_amount($items);
+    $cart_tax  = (float)wpinv_get_cart_tax($items);
     $fees      = (float)wpinv_get_cart_fee_total();
-    if ( !empty( $invoice ) && $invoice->is_free_trial() ) {
+    if (!empty($invoice) && $invoice->is_free_trial()) {
         $total = 0;
     } else {
-        $total     = $subtotal - $discounts + $cart_tax + $fees;
+        $total = $subtotal - $discounts + $cart_tax + $fees;
     }
 
-    if ( $total < 0 ) {
+    if ($total < 0) {
         $total = 0.00;
     }
     
-    $total = (float)apply_filters( 'wpinv_get_cart_total', $total, $items );
+    $total = (float)apply_filters('wpinv_get_cart_total', $total, $items);
 
-    return wpinv_sanitize_amount( $total );
+    return wpinv_sanitize_amount($total);
 }
 
-function wpinv_cart_total( $cart_items = array(), $echo = true, $invoice = array() ) {
+function wpinv_cart_total($cart_items = array(), $echo = true, $invoice = array()) {
     global $cart_total;
-    $total = wpinv_price( wpinv_format_amount( wpinv_get_cart_total( $cart_items, NULL, $invoice ) ) );
-    $total = apply_filters( 'wpinv_cart_total', $total, $cart_items, $invoice );
+    $total = wpinv_price(wpinv_format_amount(wpinv_get_cart_total($cart_items, NULL, $invoice)));
+    $total = apply_filters('wpinv_cart_total', $total, $cart_items, $invoice);
     
     $cart_total = $total;
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $total;
     }
 
     echo $total;
 }
 
-function wpinv_get_cart_tax( $items = array() ) {
+function wpinv_get_cart_tax($items = array()) {
     $cart_tax = 0;
-    $items    = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items    = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( $items ) {
-        $taxes = wp_list_pluck( $items, 'tax' );
+    if ($items) {
+        $taxes = wp_list_pluck($items, 'tax');
 
-        if( is_array( $taxes ) ) {
-            $cart_tax = array_sum( $taxes );
+        if (is_array($taxes)) {
+            $cart_tax = array_sum($taxes);
         }
     }
 
     $cart_tax += wpinv_get_cart_fee_tax();
 
-    return apply_filters( 'wpinv_get_cart_tax', wpinv_sanitize_amount( $cart_tax ) );
+    return apply_filters('wpinv_get_cart_tax', wpinv_sanitize_amount($cart_tax));
 }
 
-function wpinv_cart_tax( $items = array(), $echo = false ) {
-    $cart_tax = wpinv_get_cart_tax( $items );
-    $cart_tax = wpinv_price( wpinv_format_amount( $cart_tax ) );
+function wpinv_cart_tax($items = array(), $echo = false) {
+    $cart_tax = wpinv_get_cart_tax($items);
+    $cart_tax = wpinv_price(wpinv_format_amount($cart_tax));
 
-    $tax = apply_filters( 'wpinv_cart_tax', $cart_tax, $items );
+    $tax = apply_filters('wpinv_cart_tax', $cart_tax, $items);
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $tax;
     }
 
     echo $tax;
 }
 
-function wpinv_get_cart_discount_code( $items = array() ) {
+function wpinv_get_cart_discount_code($items = array()) {
     $invoice = wpinv_get_invoice_cart();
-    $cart_discount_code = !empty( $invoice ) ? $invoice->get_discount_code() : '';
+    $cart_discount_code = !empty($invoice) ? $invoice->get_discount_code() : '';
     
-    return apply_filters( 'wpinv_get_cart_discount_code', $cart_discount_code );
+    return apply_filters('wpinv_get_cart_discount_code', $cart_discount_code);
 }
 
-function wpinv_cart_discount_code( $items = array(), $echo = false ) {
-    $cart_discount_code = wpinv_get_cart_discount_code( $items );
+function wpinv_cart_discount_code($items = array(), $echo = false) {
+    $cart_discount_code = wpinv_get_cart_discount_code($items);
 
-    if ( $cart_discount_code != '' ) {
+    if ($cart_discount_code != '') {
         $cart_discount_code = ' (' . $cart_discount_code . ')';
     }
     
-    $discount_code = apply_filters( 'wpinv_cart_discount_code', $cart_discount_code, $items );
+    $discount_code = apply_filters('wpinv_cart_discount_code', $cart_discount_code, $items);
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $discount_code;
     }
 
     echo $discount_code;
 }
 
-function wpinv_get_cart_discount( $items = array() ) {
+function wpinv_get_cart_discount($items = array()) {
     $invoice = wpinv_get_invoice_cart();
-    $cart_discount = !empty( $invoice ) ? $invoice->get_discount() : 0;
+    $cart_discount = !empty($invoice) ? $invoice->get_discount() : 0;
     
-    return apply_filters( 'wpinv_get_cart_discount', wpinv_sanitize_amount( $cart_discount ), $items );
+    return apply_filters('wpinv_get_cart_discount', wpinv_sanitize_amount($cart_discount), $items);
 }
 
-function wpinv_cart_discount( $items = array(), $echo = false ) {
-    $cart_discount = wpinv_get_cart_discount( $items );
-    $cart_discount = wpinv_price( wpinv_format_amount( $cart_discount ) );
+function wpinv_cart_discount($items = array(), $echo = false) {
+    $cart_discount = wpinv_get_cart_discount($items);
+    $cart_discount = wpinv_price(wpinv_format_amount($cart_discount));
 
-    $discount = apply_filters( 'wpinv_cart_discount', $cart_discount, $items );
+    $discount = apply_filters('wpinv_cart_discount', $cart_discount, $items);
 
-    if ( !$echo ) {
+    if (!$echo) {
         return $discount;
     }
 
     echo $discount;
 }
 
-function wpinv_get_cart_fees( $type = 'all', $item_id = 0 ) {
-    $item = new WPInv_Item( $item_id );
+function wpinv_get_cart_fees($type = 'all', $item_id = 0) {
+    $item = new WPInv_Item($item_id);
     
-    return $item->get_fees( $type, $item_id );
+    return $item->get_fees($type, $item_id);
 }
 
 function wpinv_get_cart_fee_total() {
-    $total  = 0;
+    $total = 0;
     $fees = wpinv_get_cart_fees();
     
-    if ( $fees ) {
-        foreach ( $fees as $fee_id => $fee ) {
+    if ($fees) {
+        foreach ($fees as $fee_id => $fee) {
             $total += $fee['amount'];
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_fee_total', $total );
+    return apply_filters('wpinv_get_cart_fee_total', $total);
 }
 
 function wpinv_get_cart_fee_tax() {
     $tax  = 0;
     $fees = wpinv_get_cart_fees();
 
-    if ( $fees ) {
-        foreach ( $fees as $fee_id => $fee ) {
-            if( ! empty( $fee['no_tax'] ) ) {
+    if ($fees) {
+        foreach ($fees as $fee_id => $fee) {
+            if (!empty($fee['no_tax'])) {
                 continue;
             }
 
-            $tax += wpinv_calculate_tax( $fee['amount'] );
+            $tax += wpinv_calculate_tax($fee['amount']);
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_fee_tax', $tax );
+    return apply_filters('wpinv_get_cart_fee_tax', $tax);
 }
 
 function wpinv_cart_has_recurring_item() {
     $cart_items = wpinv_get_cart_contents();
     
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return false;
     }
     
     $has_subscription = false;
-    foreach( $cart_items as $cart_item ) {
-        if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+    foreach ($cart_items as $cart_item) {
+        if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
             $has_subscription = true;
             break;
         }
     }
     
-    return apply_filters( 'wpinv_cart_has_recurring_item', $has_subscription, $cart_items );
+    return apply_filters('wpinv_cart_has_recurring_item', $has_subscription, $cart_items);
 }
 
 function wpinv_cart_has_free_trial() {
@@ -898,97 +898,97 @@ 
     
     $free_trial = false;
     
-    if ( !empty( $invoice ) && $invoice->is_free_trial() ) {
+    if (!empty($invoice) && $invoice->is_free_trial()) {
         $free_trial = true;
     }
     
-    return apply_filters( 'wpinv_cart_has_free_trial', $free_trial, $invoice );
+    return apply_filters('wpinv_cart_has_free_trial', $free_trial, $invoice);
 }
 
 function wpinv_get_cart_contents() {
     $cart_details = wpinv_get_cart_details();
     
-    return apply_filters( 'wpinv_get_cart_contents', $cart_details );
+    return apply_filters('wpinv_get_cart_contents', $cart_details);
 }
 
 function wpinv_get_cart_content_details() {
     global $wpinv_euvat, $wpi_current_id, $wpi_item_id, $wpinv_is_last_cart_item, $wpinv_flat_discount_total;
     $cart_items = wpinv_get_cart_contents();
     
-    if ( empty( $cart_items ) ) {
+    if (empty($cart_items)) {
         return false;
     }
     $invoice = wpinv_get_invoice_cart();
-	if ( empty( $invoice ) ) {
+	if (empty($invoice)) {
         return false;
     }
 
     $details = array();
-    $length  = count( $cart_items ) - 1;
+    $length  = count($cart_items) - 1;
     
-    if ( empty( $_POST['country'] ) ) {
+    if (empty($_POST['country'])) {
         $_POST['country'] = $invoice->country;
     }
-    if ( !isset( $_POST['state'] ) ) {
+    if (!isset($_POST['state'])) {
         $_POST['state'] = $invoice->state;
     }
 
-    foreach( $cart_items as $key => $item ) {
-        $item_id            = isset( $item['id'] ) ? sanitize_text_field( $item['id'] ) : '';
-        if ( empty( $item_id ) ) {
+    foreach ($cart_items as $key => $item) {
+        $item_id = isset($item['id']) ? sanitize_text_field($item['id']) : '';
+        if (empty($item_id)) {
             continue;
         }
         
         $wpi_current_id         = $invoice->ID;
         $wpi_item_id            = $item_id;
         
-        if ( isset( $item['custom_price'] ) && $item['custom_price'] !== '' ) {
+        if (isset($item['custom_price']) && $item['custom_price'] !== '') {
             $item_price = $item['custom_price'];
         } else {
-            if ( isset( $item['item_price'] ) && $item['item_price'] !== '' && $item['item_price'] !== false ) {
+            if (isset($item['item_price']) && $item['item_price'] !== '' && $item['item_price'] !== false) {
                 $item_price = $item['item_price'];
             } else {
-                $item_price = wpinv_get_item_price( $item_id );
+                $item_price = wpinv_get_item_price($item_id);
             }
         }
-        $discount           = wpinv_get_cart_item_discount_amount( $item );
-        $discount           = apply_filters( 'wpinv_get_cart_content_details_item_discount_amount', $discount, $item );
-        $quantity           = wpinv_get_cart_item_quantity( $item );
-        $fees               = wpinv_get_cart_fees( 'fee', $item_id );
+        $discount           = wpinv_get_cart_item_discount_amount($item);
+        $discount           = apply_filters('wpinv_get_cart_content_details_item_discount_amount', $discount, $item);
+        $quantity           = wpinv_get_cart_item_quantity($item);
+        $fees               = wpinv_get_cart_fees('fee', $item_id);
         
         $subtotal           = $item_price * $quantity;
-        $tax_rate           = wpinv_get_tax_rate( $_POST['country'], $_POST['state'], $wpi_item_id );
-        $tax_class          = $wpinv_euvat->get_item_class( $item_id );
-        $tax                = wpinv_get_cart_item_tax( $item_id, $subtotal - $discount );
+        $tax_rate           = wpinv_get_tax_rate($_POST['country'], $_POST['state'], $wpi_item_id);
+        $tax_class          = $wpinv_euvat->get_item_class($item_id);
+        $tax                = wpinv_get_cart_item_tax($item_id, $subtotal - $discount);
         
-        if ( wpinv_prices_include_tax() ) {
-            $subtotal -= wpinv_round_amount( $tax );
+        if (wpinv_prices_include_tax()) {
+            $subtotal -= wpinv_round_amount($tax);
         }
         
-        $total              = $subtotal - $discount + $tax;
+        $total = $subtotal - $discount + $tax;
         
         // Do not allow totals to go negatve
-        if( $total < 0 ) {
+        if ($total < 0) {
             $total = 0;
         }
         
-        $details[ $key ]  = array(
+        $details[$key] = array(
             'id'                => $item_id,
-            'name'              => !empty($item['name']) ? $item['name'] : get_the_title( $item_id ),
-            'item_price'        => wpinv_round_amount( $item_price ),
-            'custom_price'      => isset( $item['custom_price'] ) ? $item['custom_price'] : '',
+            'name'              => !empty($item['name']) ? $item['name'] : get_the_title($item_id),
+            'item_price'        => wpinv_round_amount($item_price),
+            'custom_price'      => isset($item['custom_price']) ? $item['custom_price'] : '',
             'quantity'          => $quantity,
-            'discount'          => wpinv_round_amount( $discount ),
-            'subtotal'          => wpinv_round_amount( $subtotal ),
-            'tax'               => wpinv_round_amount( $tax ),
-            'price'             => wpinv_round_amount( $total ),
+            'discount'          => wpinv_round_amount($discount),
+            'subtotal'          => wpinv_round_amount($subtotal),
+            'tax'               => wpinv_round_amount($tax),
+            'price'             => wpinv_round_amount($total),
             'vat_rates_class'   => $tax_class,
             'vat_rate'          => $tax_rate,
-            'meta'              => isset( $item['meta'] ) ? $item['meta'] : array(),
+            'meta'              => isset($item['meta']) ? $item['meta'] : array(),
             'fees'              => $fees,
         );
         
-        if ( $wpinv_is_last_cart_item ) {
+        if ($wpinv_is_last_cart_item) {
             $wpinv_is_last_cart_item   = false;
             $wpinv_flat_discount_total = 0.00;
         }
@@ -997,67 +997,67 @@ 
     return $details;
 }
 
-function wpinv_get_cart_details( $invoice_id = 0 ) {
+function wpinv_get_cart_details($invoice_id = 0) {
     global $ajax_cart_details;
 
-    $invoice      = wpinv_get_invoice_cart( $invoice_id );
+    $invoice      = wpinv_get_invoice_cart($invoice_id);
     $cart_details = $ajax_cart_details;
-    if ( empty( $cart_details ) && ! empty( $invoice->cart_details ) ) {
+    if (empty($cart_details) && !empty($invoice->cart_details)) {
         $cart_details = $invoice->cart_details;
     }
 
-    if ( ! empty( $cart_details ) && is_array( $cart_details ) ) {
-        $invoice_currency = ! empty( $invoice->currency ) ? $invoice->currency : wpinv_get_default_country();
+    if (!empty($cart_details) && is_array($cart_details)) {
+        $invoice_currency = !empty($invoice->currency) ? $invoice->currency : wpinv_get_default_country();
 
-        foreach ( $cart_details as $key => $cart_item ) {
-            $cart_details[ $key ]['currency'] = $invoice_currency;
+        foreach ($cart_details as $key => $cart_item) {
+            $cart_details[$key]['currency'] = $invoice_currency;
 
-            if ( ! isset( $cart_item['subtotal'] ) ) {
-                $cart_details[ $key ]['subtotal'] = $cart_item['price'];
+            if (!isset($cart_item['subtotal'])) {
+                $cart_details[$key]['subtotal'] = $cart_item['price'];
             }
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_details', $cart_details, $invoice_id );
+    return apply_filters('wpinv_get_cart_details', $cart_details, $invoice_id);
 }
 
-function wpinv_record_status_change( $invoice_id, $new_status, $old_status ) {
-    if ( 'wpi_invoice' != get_post_type( $invoice_id ) ) {
+function wpinv_record_status_change($invoice_id, $new_status, $old_status) {
+    if ('wpi_invoice' != get_post_type($invoice_id)) {
         return;
     }
 
-    if ( ( $old_status == 'wpi-pending' && $new_status == 'draft' ) || ( $old_status == 'draft' && $new_status == 'wpi-pending' ) ) {
+    if (($old_status == 'wpi-pending' && $new_status == 'draft') || ($old_status == 'draft' && $new_status == 'wpi-pending')) {
         return;
     }
 
-    $invoice    = wpinv_get_invoice( $invoice_id );
+    $invoice    = wpinv_get_invoice($invoice_id);
     
-    $old_status = wpinv_status_nicename( $old_status );
-    $new_status = wpinv_status_nicename( $new_status );
+    $old_status = wpinv_status_nicename($old_status);
+    $new_status = wpinv_status_nicename($new_status);
 
-    $status_change = sprintf( __( 'Invoice status changed from %s to %s', 'invoicing' ), $old_status, $new_status );
+    $status_change = sprintf(__('Invoice status changed from %s to %s', 'invoicing'), $old_status, $new_status);
     
     // Add note
-    return $invoice->add_note( $status_change, false, false, true );
+    return $invoice->add_note($status_change, false, false, true);
 }
-add_action( 'wpinv_update_status', 'wpinv_record_status_change', 100, 3 );
+add_action('wpinv_update_status', 'wpinv_record_status_change', 100, 3);
 
-function wpinv_complete_payment( $invoice_id, $new_status, $old_status ) {
+function wpinv_complete_payment($invoice_id, $new_status, $old_status) {
     global $wpi_has_free_trial;
     
     $wpi_has_free_trial = false;
     
-    if ( $old_status == 'publish' ) {
+    if ($old_status == 'publish') {
         return; // Make sure that payments are only paid once
     }
 
     // Make sure the payment completion is only processed when new status is paid
-    if ( $new_status != 'publish' ) {
+    if ($new_status != 'publish') {
         return;
     }
 
-    $invoice = new WPInv_Invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = new WPInv_Invoice($invoice_id);
+    if (empty($invoice)) {
         return;
     }
 
@@ -1065,58 +1065,58 @@ 
     $completed_date = $invoice->completed_date;
     $cart_details   = $invoice->cart_details;
 
-    do_action( 'wpinv_pre_complete_payment', $invoice_id );
+    do_action('wpinv_pre_complete_payment', $invoice_id);
 
-    if ( is_array( $cart_details ) ) {
+    if (is_array($cart_details)) {
         // Increase purchase count and earnings
-        foreach ( $cart_details as $cart_index => $item ) {
+        foreach ($cart_details as $cart_index => $item) {
             // Ensure these actions only run once, ever
-            if ( empty( $completed_date ) ) {
-                do_action( 'wpinv_complete_item_payment', $item['id'], $invoice_id, $item, $cart_index );
+            if (empty($completed_date)) {
+                do_action('wpinv_complete_item_payment', $item['id'], $invoice_id, $item, $cart_index);
             }
         }
     }
     
     // Check for discount codes and increment their use counts
-    if ( $discounts = $invoice->get_discounts( true ) ) {
-        if( ! empty( $discounts ) ) {
-            foreach( $discounts as $code ) {
-                wpinv_increase_discount_usage( $code );
+    if ($discounts = $invoice->get_discounts(true)) {
+        if (!empty($discounts)) {
+            foreach ($discounts as $code) {
+                wpinv_increase_discount_usage($code);
             }
         }
     }
     
     // Ensure this action only runs once ever
-    if( empty( $completed_date ) ) {
+    if (empty($completed_date)) {
         // Save the completed date
-        $invoice->set( 'completed_date', current_time( 'mysql', 0 ) );
+        $invoice->set('completed_date', current_time('mysql', 0));
         $invoice->save();
 
-        do_action( 'wpinv_complete_payment', $invoice_id );
+        do_action('wpinv_complete_payment', $invoice_id);
     }
 
     // Empty the shopping cart
     wpinv_empty_cart();
 }
-add_action( 'wpinv_update_status', 'wpinv_complete_payment', 100, 3 );
+add_action('wpinv_update_status', 'wpinv_complete_payment', 100, 3);
 
-function wpinv_update_payment_status( $invoice_id, $new_status = 'publish' ) {    
-    $invoice = !empty( $invoice_id ) && is_object( $invoice_id ) ? $invoice_id : wpinv_get_invoice( (int)$invoice_id );
+function wpinv_update_payment_status($invoice_id, $new_status = 'publish') {    
+    $invoice = !empty($invoice_id) && is_object($invoice_id) ? $invoice_id : wpinv_get_invoice((int)$invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
     
-    return $invoice->update_status( $new_status );
+    return $invoice->update_status($new_status);
 }
 
-function wpinv_cart_has_fees( $type = 'all' ) {
+function wpinv_cart_has_fees($type = 'all') {
     return false;
 }
 
 function wpinv_validate_checkout_fields() {    
     // Check if there is $_POST
-    if ( empty( $_POST ) ) {
+    if (empty($_POST)) {
         return false;
     }
     
@@ -1128,11 +1128,11 @@ 
     );
     
     // Validate agree to terms
-    $page = wpinv_get_option( 'tandc_page' );
-    if(isset($page) && (int)$page > 0 && apply_filters( 'wpinv_checkout_show_terms', true )){
+    $page = wpinv_get_option('tandc_page');
+    if (isset($page) && (int)$page > 0 && apply_filters('wpinv_checkout_show_terms', true)) {
         // Validate agree to terms
-        if ( ! isset( $_POST['wpi_terms'] ) || !$_POST['wpi_terms'] ) {
-            wpinv_set_error( 'accept_terms', apply_filters( 'wpinv_accept_terms_error_text', __( 'You must accept terms and conditions', 'invoicing' ) ) );
+        if (!isset($_POST['wpi_terms']) || !$_POST['wpi_terms']) {
+            wpinv_set_error('accept_terms', apply_filters('wpinv_accept_terms_error_text', __('You must accept terms and conditions', 'invoicing')));
         }
     }
     
@@ -1148,26 +1148,26 @@ 
     
     $invoice = wpinv_get_invoice_cart();
     $has_subscription = $invoice->is_recurring();
-    if ( empty( $invoice ) ) {
-        wpinv_set_error( 'invalid_invoice', __( 'Your cart is empty.', 'invoicing' ) );
+    if (empty($invoice)) {
+        wpinv_set_error('invalid_invoice', __('Your cart is empty.', 'invoicing'));
         return $gateway;
     }
 
     // Check if a gateway value is present
-    if ( !empty( $_REQUEST['wpi-gateway'] ) ) {
-        $gateway = sanitize_text_field( $_REQUEST['wpi-gateway'] );
+    if (!empty($_REQUEST['wpi-gateway'])) {
+        $gateway = sanitize_text_field($_REQUEST['wpi-gateway']);
 
-        if ( $invoice->is_free() ) {
+        if ($invoice->is_free()) {
             $gateway = 'manual';
-        } elseif ( !wpinv_is_gateway_active( $gateway ) ) {
-            wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not enabled', 'invoicing' ) );
-        } elseif ( $has_subscription && !wpinv_gateway_support_subscription( $gateway ) ) {
-            wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway doesnot support subscription payment', 'invoicing' ) );
+        } elseif (!wpinv_is_gateway_active($gateway)) {
+            wpinv_set_error('invalid_gateway', __('The selected payment gateway is not enabled', 'invoicing'));
+        } elseif ($has_subscription && !wpinv_gateway_support_subscription($gateway)) {
+            wpinv_set_error('invalid_gateway', __('The selected payment gateway doesnot support subscription payment', 'invoicing'));
         }
     }
 
-    if ( $has_subscription && count( wpinv_get_cart_contents() ) > 1 ) {
-        wpinv_set_error( 'subscription_invalid', __( 'Only one subscription may be purchased through payment per checkout.', 'invoicing' ) );
+    if ($has_subscription && count(wpinv_get_cart_contents()) > 1) {
+        wpinv_set_error('subscription_invalid', __('Only one subscription may be purchased through payment per checkout.', 'invoicing'));
     }
 
     return $gateway;
@@ -1181,10 +1181,10 @@ 
     
     $error = false;
     // If we have discounts, loop through them
-    if ( ! empty( $discounts ) ) {
-        foreach ( $discounts as $discount ) {
+    if (!empty($discounts)) {
+        foreach ($discounts as $discount) {
             // Check if valid
-            if (  !wpinv_is_discount_valid( $discount, (int)$wpi_cart->get_user_id() ) ) {
+            if (!wpinv_is_discount_valid($discount, (int)$wpi_cart->get_user_id())) {
                 // Discount is not valid
                 $error = true;
             }
@@ -1194,20 +1194,20 @@ 
         return NULL;
     }
 
-    if ( $error && !wpinv_get_errors() ) {
-        wpinv_set_error( 'invalid_discount', __( 'Discount code you entered is invalid', 'invoicing' ) );
+    if ($error && !wpinv_get_errors()) {
+        wpinv_set_error('invalid_discount', __('Discount code you entered is invalid', 'invoicing'));
     }
 
-    return implode( ',', $discounts );
+    return implode(',', $discounts);
 }
 
 function wpinv_checkout_validate_cc() {
     $card_data = wpinv_checkout_get_cc_info();
 
     // Validate the card zip
-    if ( !empty( $card_data['wpinv_zip'] ) ) {
-        if ( !wpinv_checkout_validate_cc_zip( $card_data['wpinv_zip'], $card_data['wpinv_country'] ) ) {
-            wpinv_set_error( 'invalid_cc_zip', __( 'The zip / postcode you entered for your billing address is invalid', 'invoicing' ) );
+    if (!empty($card_data['wpinv_zip'])) {
+        if (!wpinv_checkout_validate_cc_zip($card_data['wpinv_zip'], $card_data['wpinv_country'])) {
+            wpinv_set_error('invalid_cc_zip', __('The zip / postcode you entered for your billing address is invalid', 'invoicing'));
         }
     }
 
@@ -1217,28 +1217,28 @@ 
 
 function wpinv_checkout_get_cc_info() {
 	$cc_info = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
-	$cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
-	$cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
-	$cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
+	$cc_info['card_name']      = isset($_POST['card_name']) ? sanitize_text_field($_POST['card_name']) : '';
+	$cc_info['card_number']    = isset($_POST['card_number']) ? sanitize_text_field($_POST['card_number']) : '';
+	$cc_info['card_cvc']       = isset($_POST['card_cvc']) ? sanitize_text_field($_POST['card_cvc']) : '';
+	$cc_info['card_exp_month'] = isset($_POST['card_exp_month']) ? sanitize_text_field($_POST['card_exp_month']) : '';
+	$cc_info['card_exp_year']  = isset($_POST['card_exp_year']) ? sanitize_text_field($_POST['card_exp_year']) : '';
+	$cc_info['card_address']   = isset($_POST['wpinv_address']) ? sanitize_text_field($_POST['wpinv_address']) : '';
+	$cc_info['card_city']      = isset($_POST['wpinv_city']) ? sanitize_text_field($_POST['wpinv_city']) : '';
+	$cc_info['card_state']     = isset($_POST['wpinv_state']) ? sanitize_text_field($_POST['wpinv_state']) : '';
+	$cc_info['card_country']   = isset($_POST['wpinv_country']) ? sanitize_text_field($_POST['wpinv_country']) : '';
+	$cc_info['card_zip']       = isset($_POST['wpinv_zip']) ? sanitize_text_field($_POST['wpinv_zip']) : '';
 
 	// Return cc info
 	return $cc_info;
 }
 
-function wpinv_checkout_validate_cc_zip( $zip = 0, $country_code = '' ) {
+function wpinv_checkout_validate_cc_zip($zip = 0, $country_code = '') {
     $ret = false;
 
-    if ( empty( $zip ) || empty( $country_code ) )
+    if (empty($zip) || empty($country_code))
         return $ret;
 
-    $country_code = strtoupper( $country_code );
+    $country_code = strtoupper($country_code);
 
     $zip_regex = array(
         "AD" => "AD\d{3}",
@@ -1398,24 +1398,24 @@ 
         "ZM" => "\d{5}"
     );
 
-    if ( ! isset ( $zip_regex[ $country_code ] ) || preg_match( "/" . $zip_regex[ $country_code ] . "/i", $zip ) )
+    if (!isset ($zip_regex[$country_code]) || preg_match("/" . $zip_regex[$country_code] . "/i", $zip))
         $ret = true;
 
-    return apply_filters( 'wpinv_is_zip_valid', $ret, $zip, $country_code );
+    return apply_filters('wpinv_is_zip_valid', $ret, $zip, $country_code);
 }
 
 function wpinv_checkout_validate_agree_to_terms() {
     // Validate agree to terms
-    if ( ! isset( $_POST['wpi_agree_to_terms'] ) || $_POST['wpi_agree_to_terms'] != 1 ) {
+    if (!isset($_POST['wpi_agree_to_terms']) || $_POST['wpi_agree_to_terms'] != 1) {
         // User did not agree
-        wpinv_set_error( 'agree_to_terms', apply_filters( 'wpinv_agree_to_terms_text', __( 'You must agree to the terms of use', 'invoicing' ) ) );
+        wpinv_set_error('agree_to_terms', apply_filters('wpinv_agree_to_terms_text', __('You must agree to the terms of use', 'invoicing')));
     }
 }
 
 function wpinv_checkout_validate_invoice_user() {
     global $wpi_cart, $user_ID;
 
-    if(empty($wpi_cart)){
+    if (empty($wpi_cart)) {
         $wpi_cart = wpinv_get_invoice_cart();
     }
 
@@ -1425,45 +1425,45 @@ 
     );
 
     // If guest checkout allowed
-    if ( !wpinv_require_login_to_checkout() ) {
+    if (!wpinv_require_login_to_checkout()) {
         return $valid_user_data;
     }
     
     // Verify there is a user_ID
-    if ( $user_ID == $invoice_user ) {
+    if ($user_ID == $invoice_user) {
         // Get the logged in user data
-        $user_data = get_userdata( $user_ID );
-        $required_fields  = wpinv_checkout_required_fields();
+        $user_data = get_userdata($user_ID);
+        $required_fields = wpinv_checkout_required_fields();
 
         // Loop through required fields and show error messages
-         if ( !empty( $required_fields ) ) {
-            foreach ( $required_fields as $field_name => $value ) {
-                if ( in_array( $value, $required_fields ) && empty( $_POST[ 'wpinv_' . $field_name ] ) ) {
-                    wpinv_set_error( $value['error_id'], $value['error_message'] );
+         if (!empty($required_fields)) {
+            foreach ($required_fields as $field_name => $value) {
+                if (in_array($value, $required_fields) && empty($_POST['wpinv_' . $field_name])) {
+                    wpinv_set_error($value['error_id'], $value['error_message']);
                 }
             }
         }
 
         // Verify data
-        if ( $user_data ) {
+        if ($user_data) {
             // Collected logged in user data
             $valid_user_data = array(
                 'user_id'     => $user_ID,
-                'email'       => isset( $_POST['wpinv_email'] ) ? sanitize_email( $_POST['wpinv_email'] ) : $user_data->user_email,
-                'first_name'  => isset( $_POST['wpinv_first_name'] ) && ! empty( $_POST['wpinv_first_name'] ) ? sanitize_text_field( $_POST['wpinv_first_name'] ) : $user_data->first_name,
-                'last_name'   => isset( $_POST['wpinv_last_name'] ) && ! empty( $_POST['wpinv_last_name']  ) ? sanitize_text_field( $_POST['wpinv_last_name']  ) : $user_data->last_name,
+                'email'       => isset($_POST['wpinv_email']) ? sanitize_email($_POST['wpinv_email']) : $user_data->user_email,
+                'first_name'  => isset($_POST['wpinv_first_name']) && !empty($_POST['wpinv_first_name']) ? sanitize_text_field($_POST['wpinv_first_name']) : $user_data->first_name,
+                'last_name'   => isset($_POST['wpinv_last_name']) && !empty($_POST['wpinv_last_name']) ? sanitize_text_field($_POST['wpinv_last_name']) : $user_data->last_name,
             );
 
-            if ( !empty( $_POST[ 'wpinv_email' ] ) && !is_email( $_POST[ 'wpinv_email' ] ) ) {
-                wpinv_set_error( 'invalid_email', __( 'Please enter a valid email address', 'invoicing' ) );
+            if (!empty($_POST['wpinv_email']) && !is_email($_POST['wpinv_email'])) {
+                wpinv_set_error('invalid_email', __('Please enter a valid email address', 'invoicing'));
             }
         } else {
             // Set invalid user error
-            wpinv_set_error( 'invalid_user', __( 'The user billing information is invalid', 'invoicing' ) );
+            wpinv_set_error('invalid_user', __('The user billing information is invalid', 'invoicing'));
         }
     } else {
         // Set invalid user error
-        wpinv_set_error( 'invalid_user_id', __( 'The invalid invoice user id', 'invoicing' ) );
+        wpinv_set_error('invalid_user_id', __('The invalid invoice user id', 'invoicing'));
     }
 
     // Return user data
@@ -1475,27 +1475,27 @@ 
 
     $data = array();
     
-    if ( is_user_logged_in() ) {
-        if ( !wpinv_require_login_to_checkout() || ( wpinv_require_login_to_checkout() && (int)$wpi_cart->get_user_id() === (int)get_current_user_id() ) ) {
+    if (is_user_logged_in()) {
+        if (!wpinv_require_login_to_checkout() || (wpinv_require_login_to_checkout() && (int)$wpi_cart->get_user_id() === (int)get_current_user_id())) {
             $data['user_id'] = (int)get_current_user_id();
         } else {
-            wpinv_set_error( 'logged_in_only', __( 'You are not allowed to pay for this invoice', 'invoicing' ) );
+            wpinv_set_error('logged_in_only', __('You are not allowed to pay for this invoice', 'invoicing'));
         }
     } else {
         // If guest checkout allowed
-        if ( !wpinv_require_login_to_checkout() ) {
+        if (!wpinv_require_login_to_checkout()) {
             $data['user_id'] = 0;
         } else {
-            wpinv_set_error( 'logged_in_only', __( 'You must be logged in to pay for this invoice', 'invoicing' ) );
+            wpinv_set_error('logged_in_only', __('You must be logged in to pay for this invoice', 'invoicing'));
         }
     }
 
     return $data;
 }
 
-function wpinv_checkout_form_get_user( $valid_data = array() ) {
+function wpinv_checkout_form_get_user($valid_data = array()) {
 
-    if ( !empty( $valid_data['current_user']['user_id'] ) ) {
+    if (!empty($valid_data['current_user']['user_id'])) {
         $user = $valid_data['current_user'];
     } else {
         // Set the valid invoice user
@@ -1503,7 +1503,7 @@ 
     }
 
     // Verify invoice have an user
-    if ( false === $user || empty( $user ) ) {
+    if (false === $user || empty($user)) {
         return false;
     }
 
@@ -1520,11 +1520,11 @@ 
         'zip',
     );
     
-    foreach ( $address_fields as $field ) {
-        $user[$field]  = !empty( $_POST['wpinv_' . $field] ) ? sanitize_text_field( $_POST['wpinv_' . $field] ) : false;
+    foreach ($address_fields as $field) {
+        $user[$field] = !empty($_POST['wpinv_' . $field]) ? sanitize_text_field($_POST['wpinv_' . $field]) : false;
         
-        if ( !empty( $user['user_id'] ) && !empty( $valid_data['current_user']['user_id'] ) && $valid_data['current_user']['user_id'] == $valid_data['invoice_user']['user_id'] ) {
-            update_user_meta( $user['user_id'], '_wpinv_' . $field, $user[$field] );
+        if (!empty($user['user_id']) && !empty($valid_data['current_user']['user_id']) && $valid_data['current_user']['user_id'] == $valid_data['invoice_user']['user_id']) {
+            update_user_meta($user['user_id'], '_wpinv_' . $field, $user[$field]);
         }
     }
 
@@ -1532,28 +1532,28 @@ 
     return $user;
 }
 
-function wpinv_set_checkout_session( $invoice_data = array() ) {
+function wpinv_set_checkout_session($invoice_data = array()) {
     global $wpi_session;
     
-    return $wpi_session->set( 'wpinv_checkout', $invoice_data );
+    return $wpi_session->set('wpinv_checkout', $invoice_data);
 }
 
 function wpinv_get_checkout_session() {
 	global $wpi_session;
     
-    return $wpi_session->get( 'wpinv_checkout' );
+    return $wpi_session->get('wpinv_checkout');
 }
 
 function wpinv_empty_cart() {
     global $wpi_session;
 
     // Remove cart contents
-    $wpi_session->set( 'wpinv_checkout', NULL );
+    $wpi_session->set('wpinv_checkout', NULL);
 
     // Remove all cart fees
-    $wpi_session->set( 'wpi_cart_fees', NULL );
+    $wpi_session->set('wpi_cart_fees', NULL);
 
-    do_action( 'wpinv_empty_cart' );
+    do_action('wpinv_empty_cart');
 }
 
 function wpinv_process_checkout() {
@@ -1562,7 +1562,7 @@ 
     wpinv_clear_errors();
     
     $invoice = wpinv_get_invoice_cart();
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
     
@@ -1570,42 +1570,42 @@ 
     
     $wpi_checkout_id = $invoice->ID;
     
-    do_action( 'wpinv_pre_process_checkout' );
+    do_action('wpinv_pre_process_checkout');
     
-    if ( !wpinv_get_cart_contents() ) { // Make sure the cart isn't empty
+    if (!wpinv_get_cart_contents()) { // Make sure the cart isn't empty
         $valid_data = false;
-        wpinv_set_error( 'empty_cart', __( 'Your cart is empty', 'invoicing' ) );
+        wpinv_set_error('empty_cart', __('Your cart is empty', 'invoicing'));
     } else {
         // Validate the form $_POST data
         $valid_data = wpinv_validate_checkout_fields();
         
         // Allow themes and plugins to hook to errors
-        do_action( 'wpinv_checkout_error_checks', $valid_data, $_POST );
+        do_action('wpinv_checkout_error_checks', $valid_data, $_POST);
     }
     
-    $is_ajax    = defined( 'DOING_AJAX' ) && DOING_AJAX;
+    $is_ajax = defined('DOING_AJAX') && DOING_AJAX;
     
     // Validate the user
-    $user = wpinv_checkout_form_get_user( $valid_data );
+    $user = wpinv_checkout_form_get_user($valid_data);
 
     // Let extensions validate fields after user is logged in if user has used login/registration form
-    do_action( 'wpinv_checkout_user_error_checks', $user, $valid_data, $_POST );
+    do_action('wpinv_checkout_user_error_checks', $user, $valid_data, $_POST);
     
-    if ( false === $valid_data || wpinv_get_errors() || ! $user ) {
-        if ( $is_ajax ) {
-            do_action( 'wpinv_ajax_checkout_errors' );
+    if (false === $valid_data || wpinv_get_errors() || !$user) {
+        if ($is_ajax) {
+            do_action('wpinv_ajax_checkout_errors');
             die();
         } else {
             return false;
         }
     }
 
-    if ( $is_ajax ) {
+    if ($is_ajax) {
         // Save address fields.
-        $address_fields = array( 'first_name', 'last_name', 'phone', 'address', 'city', 'country', 'state', 'zip', 'company' );
-        foreach ( $address_fields as $field ) {
-            if ( isset( $user[$field] ) ) {
-                $invoice->set( $field, $user[$field] );
+        $address_fields = array('first_name', 'last_name', 'phone', 'address', 'city', 'country', 'state', 'zip', 'company');
+        foreach ($address_fields as $field) {
+            if (isset($user[$field])) {
+                $invoice->set($field, $user[$field]);
             }
 
             $invoice->save();
@@ -1613,16 +1613,16 @@ 
 
         $response['success']            = true;
         $response['data']['subtotal']   = $invoice->get_subtotal();
-        $response['data']['subtotalf']  = $invoice->get_subtotal( true );
+        $response['data']['subtotalf']  = $invoice->get_subtotal(true);
         $response['data']['discount']   = $invoice->get_discount();
-        $response['data']['discountf']  = $invoice->get_discount( true );
+        $response['data']['discountf']  = $invoice->get_discount(true);
         $response['data']['tax']        = $invoice->get_tax();
-        $response['data']['taxf']       = $invoice->get_tax( true );
+        $response['data']['taxf']       = $invoice->get_tax(true);
         $response['data']['total']      = $invoice->get_total();
-        $response['data']['totalf']     = $invoice->get_total( true );
-	    $response['data']['free']       = $invoice->is_free() && ( ! ( (float) $response['data']['total'] > 0 ) || $invoice->is_free_trial() ) ? true : false;
+        $response['data']['totalf']     = $invoice->get_total(true);
+	    $response['data']['free'] = $invoice->is_free() && (!((float)$response['data']['total'] > 0) || $invoice->is_free_trial()) ? true : false;
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
     $user_info = array(
@@ -1644,42 +1644,42 @@ 
     
     // Setup invoice information
     $invoice_data = array(
-        'invoice_id'        => !empty( $invoice ) ? $invoice->ID : 0,
+        'invoice_id'        => !empty($invoice) ? $invoice->ID : 0,
         'items'             => $cart_items,
         'cart_discounts'    => $discounts,
-        'fees'              => wpinv_get_cart_fees(),        // Any arbitrary fees that have been added to the cart
-        'subtotal'          => wpinv_get_cart_subtotal( $cart_items ),    // Amount before taxes and discounts
-        'discount'          => wpinv_get_cart_items_discount_amount( $cart_items, $discounts ), // Discounted amount
-        'tax'               => wpinv_get_cart_tax( $cart_items ),               // Taxed amount
-        'price'             => wpinv_get_cart_total( $cart_items, $discounts ),    // Amount after taxes
+        'fees'              => wpinv_get_cart_fees(), // Any arbitrary fees that have been added to the cart
+        'subtotal'          => wpinv_get_cart_subtotal($cart_items), // Amount before taxes and discounts
+        'discount'          => wpinv_get_cart_items_discount_amount($cart_items, $discounts), // Discounted amount
+        'tax'               => wpinv_get_cart_tax($cart_items), // Taxed amount
+        'price'             => wpinv_get_cart_total($cart_items, $discounts), // Amount after taxes
         'invoice_key'       => $invoice->get_key() ? $invoice->get_key() : $invoice->generate_key(),
         'user_email'        => $invoice->get_email(),
-        'date'              => date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ),
-        'user_info'         => stripslashes_deep( $user_info ),
+        'date'              => date('Y-m-d H:i:s', current_time('timestamp')),
+        'user_info'         => stripslashes_deep($user_info),
         'post_data'         => $_POST,
         'cart_details'      => $cart_items,
         'gateway'           => $valid_data['gateway'],
         'card_info'         => $valid_data['cc_info']
     );
     
-    $vat_info   = $wpinv_euvat->current_vat_data();
-    if ( is_array( $vat_info ) ) {
+    $vat_info = $wpinv_euvat->current_vat_data();
+    if (is_array($vat_info)) {
         $invoice_data['user_info']['vat_number']        = $vat_info['number'];
         $invoice_data['user_info']['vat_rate']          = wpinv_get_tax_rate($invoice_data['user_info']['country'], $invoice_data['user_info']['state']);
-        $invoice_data['user_info']['adddress_confirmed']    = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
+        $invoice_data['user_info']['adddress_confirmed'] = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
 
         // Add the VAT rate to each item in the cart
-        foreach( $invoice_data['cart_details'] as $key => $item_data) {
+        foreach ($invoice_data['cart_details'] as $key => $item_data) {
             $rate = wpinv_get_tax_rate($invoice_data['user_info']['country'], $invoice_data['user_info']['state'], $item_data['id']);
-            $invoice_data['cart_details'][$key]['vat_rate'] = wpinv_round_amount( $rate, 4 );
+            $invoice_data['cart_details'][$key]['vat_rate'] = wpinv_round_amount($rate, 4);
         }
     }
     
     // Save vat fields.
-    $address_fields = array( 'vat_number', 'vat_rate', 'adddress_confirmed' );
-    foreach ( $address_fields as $field ) {
-        if ( isset( $invoice_data['user_info'][$field] ) ) {
-            $invoice->set( $field, $invoice_data['user_info'][$field] );
+    $address_fields = array('vat_number', 'vat_rate', 'adddress_confirmed');
+    foreach ($address_fields as $field) {
+        if (isset($invoice_data['user_info'][$field])) {
+            $invoice->set($field, $invoice_data['user_info'][$field]);
         }
 
         $invoice->save();
@@ -1689,55 +1689,55 @@ 
     $valid_data['user'] = $user;
     
     // Allow themes and plugins to hook before the gateway
-    do_action( 'wpinv_checkout_before_gateway', $_POST, $user_info, $valid_data );
+    do_action('wpinv_checkout_before_gateway', $_POST, $user_info, $valid_data);
     
     // If the total amount in the cart is 0, send to the manual gateway. This emulates a free invoice
-    if ( !$invoice_data['price'] ) {
+    if (!$invoice_data['price']) {
         // Revert to manual
         $invoice_data['gateway'] = 'manual';
         $_POST['wpi-gateway'] = 'manual';
     }
     
     // Allow the invoice data to be modified before it is sent to the gateway
-    $invoice_data = apply_filters( 'wpinv_data_before_gateway', $invoice_data, $valid_data );
+    $invoice_data = apply_filters('wpinv_data_before_gateway', $invoice_data, $valid_data);
     
-    if ( $invoice_data['price'] && $invoice_data['gateway'] == 'manual' ) {
+    if ($invoice_data['price'] && $invoice_data['gateway'] == 'manual') {
         $mode = 'test';
     } else {
-        $mode = wpinv_is_test_mode( $invoice_data['gateway'] ) ? 'test' : 'live';
+        $mode = wpinv_is_test_mode($invoice_data['gateway']) ? 'test' : 'live';
     }
     
     // Setup the data we're storing in the purchase session
     $session_data = $invoice_data;
     // Make sure credit card numbers are never stored in sessions
-    if ( !empty( $session_data['card_info']['card_number'] ) ) {
-        unset( $session_data['card_info']['card_number'] );
+    if (!empty($session_data['card_info']['card_number'])) {
+        unset($session_data['card_info']['card_number']);
     }
     
     // Used for showing item links to non logged-in users after purchase, and for other plugins needing purchase data.
-    wpinv_set_checkout_session( $invoice_data );
+    wpinv_set_checkout_session($invoice_data);
     
     // Set gateway
-    $invoice->update_meta( '_wpinv_gateway', $invoice_data['gateway'] );
-    $invoice->update_meta( '_wpinv_mode', $mode );
-    $invoice->update_meta( '_wpinv_checkout', date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ) );
+    $invoice->update_meta('_wpinv_gateway', $invoice_data['gateway']);
+    $invoice->update_meta('_wpinv_mode', $mode);
+    $invoice->update_meta('_wpinv_checkout', date_i18n('Y-m-d H:i:s', current_time('timestamp')));
     
-    do_action( 'wpinv_checkout_before_send_to_gateway', $invoice, $invoice_data );
+    do_action('wpinv_checkout_before_send_to_gateway', $invoice, $invoice_data);
 
     // Send info to the gateway for payment processing
-    wpinv_send_to_gateway( $invoice_data['gateway'], $invoice_data );
+    wpinv_send_to_gateway($invoice_data['gateway'], $invoice_data);
     die();
 }
-add_action( 'wpinv_payment', 'wpinv_process_checkout' );
+add_action('wpinv_payment', 'wpinv_process_checkout');
 
-function wpinv_get_invoices( $args ) {
-    $args = wp_parse_args( $args, array(
-        'status'   => array_keys( wpinv_get_invoice_statuses() ),
+function wpinv_get_invoices($args) {
+    $args = wp_parse_args($args, array(
+        'status'   => array_keys(wpinv_get_invoice_statuses()),
         'type'     => 'wpi_invoice',
         'parent'   => null,
         'user'     => null,
         'email'    => '',
-        'limit'    => get_option( 'posts_per_page' ),
+        'limit'    => get_option('posts_per_page'),
         'offset'   => null,
         'page'     => 1,
         'exclude'  => array(),
@@ -1745,7 +1745,7 @@ 
         'order'    => 'DESC',
         'return'   => 'objects',
         'paginate' => false,
-    ) );
+    ));
     
     // Handle some BW compatibility arg names where wp_query args differ in naming.
     $map_legacy = array(
@@ -1758,18 +1758,18 @@ 
         'paged'          => 'page',
     );
 
-    foreach ( $map_legacy as $from => $to ) {
-        if ( isset( $args[ $from ] ) ) {
-            $args[ $to ] = $args[ $from ];
+    foreach ($map_legacy as $from => $to) {
+        if (isset($args[$from])) {
+            $args[$to] = $args[$from];
         }
     }
 
-    if ( get_query_var( 'paged' ) )
+    if (get_query_var('paged'))
         $args['page'] = get_query_var('paged');
-    else if ( get_query_var( 'page' ) )
-        $args['page'] = get_query_var( 'page' );
-    else if ( !empty( $args[ 'page' ] ) )
-        $args['page'] = $args[ 'page' ];
+    else if (get_query_var('page'))
+        $args['page'] = get_query_var('page');
+    else if (!empty($args['page']))
+        $args['page'] = $args['page'];
     else
         $args['page'] = 1;
 
@@ -1782,49 +1782,49 @@ 
         'post_status'    => $args['status'],
         'posts_per_page' => $args['limit'],
         'meta_query'     => array(),
-        'date_query'     => !empty( $args['date_query'] ) ? $args['date_query'] : array(),
+        'date_query'     => !empty($args['date_query']) ? $args['date_query'] : array(),
         'fields'         => 'ids',
         'orderby'        => $args['orderby'],
         'order'          => $args['order'],
     );
     
-    if ( !empty( $args['user'] ) ) {
-        $wp_query_args['author'] = absint( $args['user'] );
+    if (!empty($args['user'])) {
+        $wp_query_args['author'] = absint($args['user']);
     }
 
-    if ( ! is_null( $args['parent'] ) ) {
-        $wp_query_args['post_parent'] = absint( $args['parent'] );
+    if (!is_null($args['parent'])) {
+        $wp_query_args['post_parent'] = absint($args['parent']);
     }
 
-    if ( ! is_null( $args['offset'] ) ) {
-        $wp_query_args['offset'] = absint( $args['offset'] );
+    if (!is_null($args['offset'])) {
+        $wp_query_args['offset'] = absint($args['offset']);
     } else {
-        $wp_query_args['paged'] = absint( $args['page'] );
+        $wp_query_args['paged'] = absint($args['page']);
     }
 
-    if ( ! empty( $args['exclude'] ) ) {
-        $wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+    if (!empty($args['exclude'])) {
+        $wp_query_args['post__not_in'] = array_map('absint', $args['exclude']);
     }
 
-    if ( ! $args['paginate' ] ) {
+    if (!$args['paginate']) {
         $wp_query_args['no_found_rows'] = true;
     }
 
     $wp_query_args = apply_filters('wpinv_get_invoices_args', $wp_query_args, $args);
 
     // Get results.
-    $invoices = new WP_Query( $wp_query_args );
+    $invoices = new WP_Query($wp_query_args);
 
-    if ( 'objects' === $args['return'] ) {
-        $return = array_map( 'wpinv_get_invoice', $invoices->posts );
-    } elseif ( 'self' === $args['return'] ) {
+    if ('objects' === $args['return']) {
+        $return = array_map('wpinv_get_invoice', $invoices->posts);
+    } elseif ('self' === $args['return']) {
         return $invoices;
     } else {
         $return = $invoices->posts;
     }
 
-    if ( $args['paginate' ] ) {
-        return (object) array(
+    if ($args['paginate']) {
+        return (object)array(
             'invoices'      => $return,
             'total'         => $invoices->found_posts,
             'max_num_pages' => $invoices->max_num_pages,
@@ -1836,22 +1836,22 @@ 
 
 function wpinv_get_user_invoices_columns() {
     $columns = array(
-            'invoice-number'  => array( 'title' => __( 'ID', 'invoicing' ), 'class' => 'text-left' ),
-            'created-date'    => array( 'title' => __( 'Created Date', 'invoicing' ), 'class' => 'text-left' ),
-            'payment-date'    => array( 'title' => __( 'Payment Date', 'invoicing' ), 'class' => 'text-left' ),
-            'invoice-status'  => array( 'title' => __( 'Status', 'invoicing' ), 'class' => 'text-center' ),
-            'invoice-total'   => array( 'title' => __( 'Total', 'invoicing' ), 'class' => 'text-right' ),
-            'invoice-actions' => array( 'title' => '&nbsp;', 'class' => 'text-center' ),
+            'invoice-number'  => array('title' => __('ID', 'invoicing'), 'class' => 'text-left'),
+            'created-date'    => array('title' => __('Created Date', 'invoicing'), 'class' => 'text-left'),
+            'payment-date'    => array('title' => __('Payment Date', 'invoicing'), 'class' => 'text-left'),
+            'invoice-status'  => array('title' => __('Status', 'invoicing'), 'class' => 'text-center'),
+            'invoice-total'   => array('title' => __('Total', 'invoicing'), 'class' => 'text-right'),
+            'invoice-actions' => array('title' => '&nbsp;', 'class' => 'text-center'),
         );
 
-    return apply_filters( 'wpinv_user_invoices_columns', $columns );
+    return apply_filters('wpinv_user_invoices_columns', $columns);
 }
 
-function wpinv_payment_receipt( $atts, $content = null ) {
+function wpinv_payment_receipt($atts, $content = null) {
     global $wpinv_receipt_args;
 
-    $wpinv_receipt_args = shortcode_atts( array(
-        'error'           => __( 'Sorry, trouble retrieving payment receipt.', 'invoicing' ),
+    $wpinv_receipt_args = shortcode_atts(array(
+        'error'           => __('Sorry, trouble retrieving payment receipt.', 'invoicing'),
         'price'           => true,
         'discount'        => true,
         'items'           => true,
@@ -1860,197 +1860,197 @@ 
         'invoice_key'     => false,
         'payment_method'  => true,
         'invoice_id'      => true
-    ), $atts, 'wpinv_receipt' );
+    ), $atts, 'wpinv_receipt');
 
     $session = wpinv_get_checkout_session();
-    if ( isset( $_GET['invoice_key'] ) ) {
-        $invoice_key = urldecode( $_GET['invoice_key'] );
-    } else if ( $session && isset( $session['invoice_key'] ) ) {
+    if (isset($_GET['invoice_key'])) {
+        $invoice_key = urldecode($_GET['invoice_key']);
+    } else if ($session && isset($session['invoice_key'])) {
         $invoice_key = $session['invoice_key'];
-    } elseif ( isset( $wpinv_receipt_args['invoice_key'] ) && $wpinv_receipt_args['invoice_key'] ) {
+    } elseif (isset($wpinv_receipt_args['invoice_key']) && $wpinv_receipt_args['invoice_key']) {
         $invoice_key = $wpinv_receipt_args['invoice_key'];
-    } else if ( isset( $_GET['invoice-id'] ) ) {
-        $invoice_key = wpinv_get_payment_key( (int)$_GET['invoice-id'] );
+    } else if (isset($_GET['invoice-id'])) {
+        $invoice_key = wpinv_get_payment_key((int)$_GET['invoice-id']);
     }
 
     // No key found
-    if ( ! isset( $invoice_key ) ) {
+    if (!isset($invoice_key)) {
         return '<p class="alert alert-error">' . $wpinv_receipt_args['error'] . '</p>';
     }
 
-    $invoice_id    = wpinv_get_invoice_id_by_key( $invoice_key );
-    $user_can_view = wpinv_can_view_receipt( $invoice_key );
-    if ( $user_can_view && isset( $_GET['invoice-id'] ) ) {
+    $invoice_id    = wpinv_get_invoice_id_by_key($invoice_key);
+    $user_can_view = wpinv_can_view_receipt($invoice_key);
+    if ($user_can_view && isset($_GET['invoice-id'])) {
         $invoice_id     = (int)$_GET['invoice-id'];
-        $user_can_view  = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? true : false;
+        $user_can_view  = $invoice_key == wpinv_get_payment_key((int)$_GET['invoice-id']) ? true : false;
     }
 
     // Key was provided, but user is logged out. Offer them the ability to login and view the receipt
-    if ( ! $user_can_view && ! empty( $invoice_key ) && ! is_user_logged_in() ) {
+    if (!$user_can_view && !empty($invoice_key) && !is_user_logged_in()) {
         // login redirect
-        return '<p class="alert alert-error">' . __( 'You are not allowed to access this section', 'invoicing' ) . '</p>';
+        return '<p class="alert alert-error">' . __('You are not allowed to access this section', 'invoicing') . '</p>';
     }
 
-    if ( ! apply_filters( 'wpinv_user_can_view_receipt', $user_can_view, $wpinv_receipt_args ) ) {
+    if (!apply_filters('wpinv_user_can_view_receipt', $user_can_view, $wpinv_receipt_args)) {
         return '<p class="alert alert-error">' . $wpinv_receipt_args['error'] . '</p>';
     }
 
     ob_start();
 
-    wpinv_get_template_part( 'wpinv-invoice-receipt' );
+    wpinv_get_template_part('wpinv-invoice-receipt');
 
     $display = ob_get_clean();
 
     return $display;
 }
 
-function wpinv_get_invoice_id_by_key( $key ) {
+function wpinv_get_invoice_id_by_key($key) {
 	global $wpdb;
 
-	$invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
+	$invoice_id = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key));
 
-	if ( $invoice_id != NULL )
+	if ($invoice_id != NULL)
 		return $invoice_id;
 
 	return 0;
 }
 
-function wpinv_can_view_receipt( $invoice_key = '' ) {
+function wpinv_can_view_receipt($invoice_key = '') {
 	$return = false;
 
-	if ( empty( $invoice_key ) ) {
+	if (empty($invoice_key)) {
 		return $return;
 	}
 
 	global $wpinv_receipt_args;
 
-	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
-	if ( isset( $_GET['invoice-id'] ) ) {
-		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
+	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key($invoice_key);
+	if (isset($_GET['invoice-id'])) {
+		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key((int)$_GET['invoice-id']) ? (int)$_GET['invoice-id'] : 0;
 	}
 
-	if ( empty( $wpinv_receipt_args['id'] ) ) {
+	if (empty($wpinv_receipt_args['id'])) {
 		return $return;
 	}
 
-	$invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
-	if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
+	$invoice = wpinv_get_invoice($wpinv_receipt_args['id']);
+	if (!(!empty($invoice->ID) && $invoice->get_key() === $invoice_key)) {
 		return $return;
 	}
 
-	if ( is_user_logged_in() ) {
-		if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
+	if (is_user_logged_in()) {
+		if ((int)$invoice->get_user_id() === (int)get_current_user_id()) {
 			$return = true;
 		}
 	}
 
 	$session = wpinv_get_checkout_session();
-	if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
-		$check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
+	if (isset($_GET['invoice_key']) || ($session && isset($session['invoice_key']))) {
+		$check_key = isset($_GET['invoice_key']) ? $_GET['invoice_key'] : $session['invoice_key'];
 
-		if ( wpinv_require_login_to_checkout() ) {
+		if (wpinv_require_login_to_checkout()) {
 			$return = $return && $check_key === $invoice_key;
 		} else {
 			$return = $check_key === $invoice_key;
 		}
 	}
 
-	return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
+	return (bool)apply_filters('wpinv_can_view_receipt', $return, $invoice_key);
 }
 
 function wpinv_pay_for_invoice() {
     global $wpinv_euvat;
     
-    if ( isset( $_GET['invoice_key'] ) ) {
+    if (isset($_GET['invoice_key'])) {
         $checkout_uri   = wpinv_get_checkout_uri();
-        $invoice_key    = sanitize_text_field( $_GET['invoice_key'] );
+        $invoice_key    = sanitize_text_field($_GET['invoice_key']);
         
-        if ( empty( $invoice_key ) ) {
-            wpinv_set_error( 'invalid_invoice', __( 'Invoice not found', 'invoicing' ) );
-            wp_redirect( $checkout_uri );
+        if (empty($invoice_key)) {
+            wpinv_set_error('invalid_invoice', __('Invoice not found', 'invoicing'));
+            wp_redirect($checkout_uri);
             exit();
         }
         
-        do_action( 'wpinv_check_pay_for_invoice', $invoice_key );
+        do_action('wpinv_check_pay_for_invoice', $invoice_key);
 
-        $invoice_id    = wpinv_get_invoice_id_by_key( $invoice_key );
-        $user_can_view = wpinv_can_view_receipt( $invoice_key );
-        if ( $user_can_view && isset( $_GET['invoice-id'] ) ) {
+        $invoice_id    = wpinv_get_invoice_id_by_key($invoice_key);
+        $user_can_view = wpinv_can_view_receipt($invoice_key);
+        if ($user_can_view && isset($_GET['invoice-id'])) {
             $invoice_id     = (int)$_GET['invoice-id'];
-            $user_can_view  = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? true : false;
+            $user_can_view  = $invoice_key == wpinv_get_payment_key((int)$_GET['invoice-id']) ? true : false;
         }
         
-        if ( $invoice_id && $user_can_view && ( $invoice = wpinv_get_invoice( $invoice_id ) ) ) {
-            if ( $invoice->needs_payment() ) {
+        if ($invoice_id && $user_can_view && ($invoice = wpinv_get_invoice($invoice_id))) {
+            if ($invoice->needs_payment()) {
                 $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 ( wpinv_get_option( 'vat_ip_country_default' ) ) {
+                if (wpinv_get_option('vat_ip_country_default')) {
                     $_POST['country']   = $wpinv_euvat->get_country_by_ip();
                     $_POST['state']     = $_POST['country'] == $invoice->country ? $invoice->state : '';
                     
-                    wpinv_recalculate_tax( true );
+                    wpinv_recalculate_tax(true);
                 }
                 
             } else {
                 $checkout_uri = $invoice->get_view_url();
             }
         } else {
-            wpinv_set_error( 'invalid_invoice', __( 'You are not allowed to view this invoice', 'invoicing' ) );
+            wpinv_set_error('invalid_invoice', __('You are not allowed to view this invoice', 'invoicing'));
             
-            $checkout_uri = is_user_logged_in() ? wpinv_get_history_page_uri() : wp_login_url( get_permalink() );
+            $checkout_uri = is_user_logged_in() ? wpinv_get_history_page_uri() : wp_login_url(get_permalink());
         }
         
-        if(wp_redirect( $checkout_uri )){
+        if (wp_redirect($checkout_uri)) {
             exit;
         };
         wpinv_die();
     }
 }
-add_action( 'wpinv_pay_for_invoice', 'wpinv_pay_for_invoice' );
+add_action('wpinv_pay_for_invoice', 'wpinv_pay_for_invoice');
 
-function wpinv_handle_pay_via_invoice_link( $invoice_key ) {
-    if ( !empty( $invoice_key ) && !empty( $_REQUEST['_wpipay'] ) && !is_user_logged_in() && $invoice_id = wpinv_get_invoice_id_by_key( $invoice_key ) ) {
-        if ( $invoice = wpinv_get_invoice( $invoice_id ) ) {
+function wpinv_handle_pay_via_invoice_link($invoice_key) {
+    if (!empty($invoice_key) && !empty($_REQUEST['_wpipay']) && !is_user_logged_in() && $invoice_id = wpinv_get_invoice_id_by_key($invoice_key)) {
+        if ($invoice = wpinv_get_invoice($invoice_id)) {
             $user_id = $invoice->get_user_id();
-            $secret = sanitize_text_field( $_GET['_wpipay'] );
+            $secret = sanitize_text_field($_GET['_wpipay']);
             
-            if ( $secret === md5( $user_id . '::' . $invoice->get_email() . '::' . $invoice_key ) ) { // valid invoice link
-                $redirect_to = remove_query_arg( '_wpipay', get_permalink() );
+            if ($secret === md5($user_id . '::' . $invoice->get_email() . '::' . $invoice_key)) { // valid invoice link
+                $redirect_to = remove_query_arg('_wpipay', get_permalink());
                 
-                wpinv_guest_redirect( $redirect_to, $user_id );
+                wpinv_guest_redirect($redirect_to, $user_id);
                 exit();
             }
         }
     }
 }
-add_action( 'wpinv_check_pay_for_invoice', 'wpinv_handle_pay_via_invoice_link' );
+add_action('wpinv_check_pay_for_invoice', 'wpinv_handle_pay_via_invoice_link');
 
-function wpinv_set_payment_transaction_id( $invoice_id = 0, $transaction_id = '' ) {
-    $invoice_id = is_object( $invoice_id ) && !empty( $invoice_id->ID ) ? $invoice_id : $invoice_id;
+function wpinv_set_payment_transaction_id($invoice_id = 0, $transaction_id = '') {
+    $invoice_id = is_object($invoice_id) && !empty($invoice_id->ID) ? $invoice_id : $invoice_id;
     
-    if ( empty( $invoice_id ) && $invoice_id > 0 ) {
+    if (empty($invoice_id) && $invoice_id > 0) {
         return false;
     }
     
-    if ( empty( $transaction_id ) ) {
+    if (empty($transaction_id)) {
         $transaction_id = $invoice_id;
     }
 
-    $transaction_id = apply_filters( 'wpinv_set_payment_transaction_id', $transaction_id, $invoice_id );
+    $transaction_id = apply_filters('wpinv_set_payment_transaction_id', $transaction_id, $invoice_id);
     
-    return wpinv_update_invoice_meta( $invoice_id, '_wpinv_transaction_id', $transaction_id );
+    return wpinv_update_invoice_meta($invoice_id, '_wpinv_transaction_id', $transaction_id);
 }
 
-function wpinv_invoice_status_label( $status, $status_display = '' ) {
-    if ( empty( $status_display ) ) {
-        $status_display = wpinv_status_nicename( $status );
+function wpinv_invoice_status_label($status, $status_display = '') {
+    if (empty($status_display)) {
+        $status_display = wpinv_status_nicename($status);
     }
     
-    switch ( $status ) {
+    switch ($status) {
         case 'publish' :
         case 'wpi-renewal' :
             $class = 'label-success';
@@ -2075,201 +2075,201 @@ 
     
     $label = '<span class="label label-inv-' . $status . ' ' . $class . '">' . $status_display . '</span>';
     
-    return apply_filters( 'wpinv_invoice_status_label', $label, $status, $status_display );
+    return apply_filters('wpinv_invoice_status_label', $label, $status, $status_display);
 }
 
-function wpinv_format_invoice_number( $number, $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_format_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+function wpinv_format_invoice_number($number, $type = '') {
+    $check = apply_filters('wpinv_pre_format_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
 
-    if ( !empty( $number ) && !is_numeric( $number ) ) {
+    if (!empty($number) && !is_numeric($number)) {
         return $number;
     }
 
-    $padd  = wpinv_get_option( 'invoice_number_padd' );
-    $prefix  = wpinv_get_option( 'invoice_number_prefix' );
-    $postfix = wpinv_get_option( 'invoice_number_postfix' );
+    $padd = wpinv_get_option('invoice_number_padd');
+    $prefix  = wpinv_get_option('invoice_number_prefix');
+    $postfix = wpinv_get_option('invoice_number_postfix');
     
-    $padd = absint( $padd );
-    $formatted_number = absint( $number );
+    $padd = absint($padd);
+    $formatted_number = absint($number);
     
-    if ( $padd > 0 ) {
-        $formatted_number = zeroise( $formatted_number, $padd );
+    if ($padd > 0) {
+        $formatted_number = zeroise($formatted_number, $padd);
     }    
 
     $formatted_number = $prefix . $formatted_number . $postfix;
 
-    return apply_filters( 'wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd );
+    return apply_filters('wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd);
 }
 
-function wpinv_get_next_invoice_number( $type = '' ) {
-    $check = apply_filters( 'wpinv_get_pre_next_invoice_number', null, $type );
-    if ( null !== $check ) {
+function wpinv_get_next_invoice_number($type = '') {
+    $check = apply_filters('wpinv_get_pre_next_invoice_number', null, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    if ( !wpinv_sequential_number_active() ) {
+    if (!wpinv_sequential_number_active()) {
         return false;
     }
 
-    $number = $last_number = get_option( 'wpinv_last_invoice_number', 0 );
-    $start  = wpinv_get_option( 'invoice_sequence_start', 1 );
-    if ( !absint( $start ) > 0 ) {
+    $number = $last_number = get_option('wpinv_last_invoice_number', 0);
+    $start  = wpinv_get_option('invoice_sequence_start', 1);
+    if (!absint($start) > 0) {
         $start = 1;
     }
     $increment_number = true;
     $save_number = false;
 
-    if ( !empty( $number ) && !is_numeric( $number ) && $number == wpinv_format_invoice_number( $number ) ) {
-        $number = wpinv_clean_invoice_number( $number );
+    if (!empty($number) && !is_numeric($number) && $number == wpinv_format_invoice_number($number)) {
+        $number = wpinv_clean_invoice_number($number);
     }
 
-    if ( empty( $number ) ) {
-        if ( !( $last_number === 0 || $last_number === '0' ) ) {
-            $last_invoice = wpinv_get_invoices( array( 'limit' => 1, 'order' => 'DESC', 'orderby' => 'ID', 'return' => 'posts', 'fields' => 'ids', 'status' => array_keys( wpinv_get_invoice_statuses( true, true ) ) ) );
+    if (empty($number)) {
+        if (!($last_number === 0 || $last_number === '0')) {
+            $last_invoice = wpinv_get_invoices(array('limit' => 1, 'order' => 'DESC', 'orderby' => 'ID', 'return' => 'posts', 'fields' => 'ids', 'status' => array_keys(wpinv_get_invoice_statuses(true, true))));
 
-            if ( !empty( $last_invoice[0] ) && $invoice_number = wpinv_get_invoice_number( $last_invoice[0] ) ) {
-                if ( is_numeric( $invoice_number ) ) {
+            if (!empty($last_invoice[0]) && $invoice_number = wpinv_get_invoice_number($last_invoice[0])) {
+                if (is_numeric($invoice_number)) {
                     $number = $invoice_number;
                 } else {
-                    $number = wpinv_clean_invoice_number( $invoice_number );
+                    $number = wpinv_clean_invoice_number($invoice_number);
                 }
             }
 
-            if ( empty( $number ) ) {
+            if (empty($number)) {
                 $increment_number = false;
                 $number = $start;
-                $save_number = ( $number - 1 );
+                $save_number = ($number - 1);
             } else {
                 $save_number = $number;
             }
         }
     }
 
-    if ( $start > $number ) {
+    if ($start > $number) {
         $increment_number = false;
         $number = $start;
-        $save_number = ( $number - 1 );
+        $save_number = ($number - 1);
     }
 
-    if ( $save_number !== false ) {
-        update_option( 'wpinv_last_invoice_number', $save_number );
+    if ($save_number !== false) {
+        update_option('wpinv_last_invoice_number', $save_number);
     }
     
-    $increment_number = apply_filters( 'wpinv_increment_payment_number', $increment_number, $number );
+    $increment_number = apply_filters('wpinv_increment_payment_number', $increment_number, $number);
 
-    if ( $increment_number ) {
+    if ($increment_number) {
         $number++;
     }
 
-    return apply_filters( 'wpinv_get_next_invoice_number', $number );
+    return apply_filters('wpinv_get_next_invoice_number', $number);
 }
 
-function wpinv_clean_invoice_number( $number, $type = '' ) {
-    $check = apply_filters( 'wpinv_pre_clean_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+function wpinv_clean_invoice_number($number, $type = '') {
+    $check = apply_filters('wpinv_pre_clean_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
     
-    $prefix  = wpinv_get_option( 'invoice_number_prefix' );
-    $postfix = wpinv_get_option( 'invoice_number_postfix' );
+    $prefix  = wpinv_get_option('invoice_number_prefix');
+    $postfix = wpinv_get_option('invoice_number_postfix');
 
-    $number = preg_replace( '/' . $prefix . '/', '', $number, 1 );
+    $number = preg_replace('/' . $prefix . '/', '', $number, 1);
 
-    $length      = strlen( $number );
-    $postfix_pos = strrpos( $number, $postfix );
+    $length      = strlen($number);
+    $postfix_pos = strrpos($number, $postfix);
     
-    if ( false !== $postfix_pos ) {
-        $number      = substr_replace( $number, '', $postfix_pos, $length );
+    if (false !== $postfix_pos) {
+        $number = substr_replace($number, '', $postfix_pos, $length);
     }
 
-    $number = intval( $number );
+    $number = intval($number);
 
-    return apply_filters( 'wpinv_clean_invoice_number', $number, $prefix, $postfix );
+    return apply_filters('wpinv_clean_invoice_number', $number, $prefix, $postfix);
 }
 
-function wpinv_save_number_post_saved( $post_ID, $post, $update ) {
+function wpinv_save_number_post_saved($post_ID, $post, $update) {
     global $wpdb;
 
-    if ( !$update && !get_post_meta( $post_ID, '_wpinv_number', true ) ) {
-        wpinv_update_invoice_number( $post_ID, $post->post_status != 'auto-draft', $post->post_type );
+    if (!$update && !get_post_meta($post_ID, '_wpinv_number', true)) {
+        wpinv_update_invoice_number($post_ID, $post->post_status != 'auto-draft', $post->post_type);
     }
 
-    if ( !$update ) {
-        $wpdb->update( $wpdb->posts, array( 'post_name' => wpinv_generate_post_name( $post_ID ) ), array( 'ID' => $post_ID ) );
-        clean_post_cache( $post_ID );
+    if (!$update) {
+        $wpdb->update($wpdb->posts, array('post_name' => wpinv_generate_post_name($post_ID)), array('ID' => $post_ID));
+        clean_post_cache($post_ID);
     }
 }
-add_action( 'save_post_wpi_invoice', 'wpinv_save_number_post_saved', 1, 3 );
+add_action('save_post_wpi_invoice', 'wpinv_save_number_post_saved', 1, 3);
 
-function wpinv_save_number_post_updated( $post_ID, $post_after, $post_before ) {
-    if ( !empty( $post_after->post_type ) && $post_after->post_type == 'wpi_invoice' && $post_before->post_status == 'auto-draft' && $post_after->post_status != $post_before->post_status ) {
-        wpinv_update_invoice_number( $post_ID, true, $post_after->post_type );
+function wpinv_save_number_post_updated($post_ID, $post_after, $post_before) {
+    if (!empty($post_after->post_type) && $post_after->post_type == 'wpi_invoice' && $post_before->post_status == 'auto-draft' && $post_after->post_status != $post_before->post_status) {
+        wpinv_update_invoice_number($post_ID, true, $post_after->post_type);
     }
 }
-add_action( 'post_updated', 'wpinv_save_number_post_updated', 1, 3 );
+add_action('post_updated', 'wpinv_save_number_post_updated', 1, 3);
 
-function wpinv_update_invoice_number( $post_ID, $save_sequential = false, $type = '' ) {
+function wpinv_update_invoice_number($post_ID, $save_sequential = false, $type = '') {
     global $wpdb;
     
-    $check = apply_filters( 'wpinv_pre_update_invoice_number', null, $post_ID, $save_sequential, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_pre_update_invoice_number', null, $post_ID, $save_sequential, $type);
+    if (null !== $check) {
         return $check;
     }
 
-    if ( wpinv_sequential_number_active() ) {
+    if (wpinv_sequential_number_active()) {
         $number = wpinv_get_next_invoice_number();
 
-        if ( $save_sequential ) {
-            update_option( 'wpinv_last_invoice_number', $number );
+        if ($save_sequential) {
+            update_option('wpinv_last_invoice_number', $number);
         }
     } else {
         $number = $post_ID;
     }
 
-    $number = wpinv_format_invoice_number( $number );
+    $number = wpinv_format_invoice_number($number);
 
-    update_post_meta( $post_ID, '_wpinv_number', $number );
+    update_post_meta($post_ID, '_wpinv_number', $number);
 
-    $wpdb->update( $wpdb->posts, array( 'post_title' => $number ), array( 'ID' => $post_ID ) );
+    $wpdb->update($wpdb->posts, array('post_title' => $number), array('ID' => $post_ID));
 
-    clean_post_cache( $post_ID );
+    clean_post_cache($post_ID);
 
     return $number;
 }
 
-function wpinv_post_name_prefix( $post_type = 'wpi_invoice' ) {
-    return apply_filters( 'wpinv_post_name_prefix', 'inv-', $post_type );
+function wpinv_post_name_prefix($post_type = 'wpi_invoice') {
+    return apply_filters('wpinv_post_name_prefix', 'inv-', $post_type);
 }
 
-function wpinv_generate_post_name( $post_ID ) {
-    $prefix = wpinv_post_name_prefix( get_post_type( $post_ID ) );
-    $post_name = sanitize_title( $prefix . $post_ID );
+function wpinv_generate_post_name($post_ID) {
+    $prefix = wpinv_post_name_prefix(get_post_type($post_ID));
+    $post_name = sanitize_title($prefix . $post_ID);
 
-    return apply_filters( 'wpinv_generate_post_name', $post_name, $post_ID, $prefix );
+    return apply_filters('wpinv_generate_post_name', $post_name, $post_ID, $prefix);
 }
 
-function wpinv_is_invoice_viewed( $invoice_id ) {
-    if ( empty( $invoice_id ) ) {
+function wpinv_is_invoice_viewed($invoice_id) {
+    if (empty($invoice_id)) {
         return false;
     }
 
-    $viewed_meta = get_post_meta( $invoice_id, '_wpinv_is_viewed', true );
+    $viewed_meta = get_post_meta($invoice_id, '_wpinv_is_viewed', true);
 
-    return apply_filters( 'wpinv_is_invoice_viewed', 1 === (int)$viewed_meta, $invoice_id );
+    return apply_filters('wpinv_is_invoice_viewed', 1 === (int)$viewed_meta, $invoice_id);
 }
 
 function wpinv_mark_invoice_viewed() {
 
-    if ( isset( $_GET['invoice_key'] ) || is_singular( 'wpi_invoice' ) || is_singular( 'wpi_quote' ) ) {
-        $invoice_key = isset( $_GET['invoice_key'] ) ? urldecode($_GET['invoice_key']) : '';
+    if (isset($_GET['invoice_key']) || is_singular('wpi_invoice') || is_singular('wpi_quote')) {
+        $invoice_key = isset($_GET['invoice_key']) ? urldecode($_GET['invoice_key']) : '';
 	    global $post;
 
-        if(!empty($invoice_key)){
+        if (!empty($invoice_key)) {
 	        $invoice_id = wpinv_get_invoice_id_by_key($invoice_key);
-        } else if(!empty( $post ) && ($post->post_type == 'wpi_invoice' || $post->post_type == 'wpi_quote')) {
+        } else if (!empty($post) && ($post->post_type == 'wpi_invoice' || $post->post_type == 'wpi_quote')) {
 			$invoice_id = $post->ID;
         } else {
         	return;
@@ -2277,60 +2277,60 @@ 
 
         $invoice = new WPInv_Invoice($invoice_id);
 
-        if(!$invoice_id){
+        if (!$invoice_id) {
             return;
         }
 
-	    if ( is_user_logged_in() ) {
-		    if ( (int)$invoice->get_user_id() === get_current_user_id() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+	    if (is_user_logged_in()) {
+		    if ((int)$invoice->get_user_id() === get_current_user_id()) {
+			    update_post_meta($invoice_id, '_wpinv_is_viewed', 1);
+		    } else if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+			    update_post_meta($invoice_id, '_wpinv_is_viewed', 1);
 		    }
 	    } else {
-		    if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+		    if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && $_GET['invoice_key'] === $invoice->get_key()) {
+			    update_post_meta($invoice_id, '_wpinv_is_viewed', 1);
 		    }
 	    }
     }
 
 }
-add_action( 'template_redirect', 'wpinv_mark_invoice_viewed' );
+add_action('template_redirect', 'wpinv_mark_invoice_viewed');
 
-function wpinv_get_subscription( $invoice, $by_parent = false ) {
-    if ( empty( $invoice ) ) {
+function wpinv_get_subscription($invoice, $by_parent = false) {
+    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 ( !( is_object( $invoice ) && ! empty( $invoice->ID ) && $invoice->is_recurring() ) ) {
+    if (!(is_object($invoice) && !empty($invoice->ID) && $invoice->is_recurring())) {
         return false;
     }
     
-    $invoice_id = ! $by_parent && ! empty( $invoice->parent_invoice ) ? $invoice->parent_invoice : $invoice->ID;
+    $invoice_id = !$by_parent && !empty($invoice->parent_invoice) ? $invoice->parent_invoice : $invoice->ID;
     
     $subs_db    = new WPInv_Subscriptions_DB;
-    $subs       = $subs_db->get_subscriptions( array( 'parent_payment_id' => $invoice_id, 'number' => 1 ) );
+    $subs       = $subs_db->get_subscriptions(array('parent_payment_id' => $invoice_id, 'number' => 1));
     
-    if ( ! empty( $subs ) ) {
-        return reset( $subs );
+    if (!empty($subs)) {
+        return reset($subs);
     }
     
     return false;
 }
 
-function wpinv_filter_posts_clauses( $clauses, $wp_query ) {
+function wpinv_filter_posts_clauses($clauses, $wp_query) {
     global $wpdb;
 
-    if ( ! empty( $wp_query->query_vars['orderby'] ) && $wp_query->query_vars['orderby'] == 'invoice_date' ) {
-        if ( !empty( $clauses['join'] ) ) {
+    if (!empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'invoice_date') {
+        if (!empty($clauses['join'])) {
             $clauses['join'] .= " ";
         }
 
-        if ( !empty( $clauses['fields'] ) ) {
+        if (!empty($clauses['fields'])) {
             $clauses['fields'] .= ", ";
         }
 
@@ -2341,4 +2341,4 @@ 
 
     return $clauses;
 }
-add_filter( 'posts_clauses', 'wpinv_filter_posts_clauses', 10, 2 );
\ No newline at end of file
+add_filter('posts_clauses', 'wpinv_filter_posts_clauses', 10, 2);
\ No newline at end of file