AyeCode / invoicing

includes/gateways/worldpay.php

Spacing +60 added lines, -60 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_worldpay_cc_form', '__return_false' );
+add_action('wpinv_worldpay_cc_form', '__return_false');
 
-function wpinv_process_worldpay_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_worldpay_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,120 +24,120 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {
+    if (!empty($invoice)) {
         $quantities_enabled = wpinv_item_quantities_enabled();
         
-        $instId     = wpinv_get_option( 'worldpay_instId', false );
+        $instId     = wpinv_get_option('worldpay_instId', false);
         $cartId     = $invoice->get_number();
-        $testMode   = wpinv_is_test_mode( 'worldpay' ) ? 100 : 0;
+        $testMode   = wpinv_is_test_mode('worldpay') ? 100 : 0;
         $name       = $invoice->get_user_full_name();
-        $address    = wp_strip_all_tags( $invoice->get_address(), true );
+        $address    = wp_strip_all_tags($invoice->get_address(), true);
         $postcode   = $invoice->zip;
         $tel        = $invoice->phone;
         $email      = $invoice->get_email();
         $country    = $invoice->country;
-        $amount     = wpinv_sanitize_amount( $invoice->get_total() );
+        $amount     = wpinv_sanitize_amount($invoice->get_total());
         $currency   = wpinv_get_currency();
         
         $items      = array();
-        foreach ( $invoice->get_cart_details() as $item ) {
+        foreach ($invoice->get_cart_details() as $item) {
             $item_desc  = $item['name'];
-            $quantity   = !empty( $item['quantity'] ) && $item['quantity'] > 0 ? $item['quantity'] : 1;
-            $item_desc .= ' (' . ( $quantities_enabled ? $quantity . 'x ' : '' ) . wpinv_price( wpinv_format_amount( $item['item_price'] ) ) . ')';
+            $quantity   = !empty($item['quantity']) && $item['quantity'] > 0 ? $item['quantity'] : 1;
+            $item_desc .= ' (' . ($quantities_enabled ? $quantity . 'x ' : '') . wpinv_price(wpinv_format_amount($item['item_price'])) . ')';
             
             $items[] = $item_desc;
         }
         
-        $desc = implode( ', ', $items );
-        if ( wpinv_use_taxes() && $invoice->get_tax() > 0 ) {
-            $desc .= ', ' . wp_sprintf( __( 'Tax: %s', 'invoicing' ), $invoice->get_tax( true ) );
+        $desc = implode(', ', $items);
+        if (wpinv_use_taxes() && $invoice->get_tax() > 0) {
+            $desc .= ', ' . wp_sprintf(__('Tax: %s', 'invoicing'), $invoice->get_tax(true));
         }
         
         $extra_params                   = array();
         $extra_params['MC_description'] = $desc;
-        $extra_params['MC_callback']    = wpinv_get_ipn_url( 'worldpay' );
+        $extra_params['MC_callback']    = wpinv_get_ipn_url('worldpay');
         $extra_params['MC_key']         = $invoice->get_key();
         $extra_params['MC_invoice_id']  = $invoice->ID;
         $extra_params['address1']       = $address;
         $extra_params['town']           = $invoice->city;
         $extra_params['region']         = $invoice->state;
-        $extra_params['amountString']   = $invoice->get_total( true );
-        $extra_params['countryString']  = wpinv_country_name( $invoice->country );
+        $extra_params['amountString']   = $invoice->get_total(true);
+        $extra_params['countryString']  = wpinv_country_name($invoice->country);
         $extra_params['compName']       = $invoice->company;
         
-        $extra_params   = apply_filters( 'wpinv_worldpay_form_extra_parameters', $extra_params, $invoice );
+        $extra_params   = apply_filters('wpinv_worldpay_form_extra_parameters', $extra_params, $invoice);
         
-        $redirect_text  = __( 'Redirecting to Worldpay site, click on button if not redirected.', 'invoicing' );
-        $redirect_text  = apply_filters( 'wpinv_worldpay_redirect_text', $redirect_text, $invoice );
+        $redirect_text  = __('Redirecting to Worldpay site, click on button if not redirected.', 'invoicing');
+        $redirect_text  = apply_filters('wpinv_worldpay_redirect_text', $redirect_text, $invoice);
         
         // Empty the shopping cart
         wpinv_empty_cart();
         ?>
 <div class="wpi-worldpay-form" style="padding:20px;font-family:arial,sans-serif;text-align:center;color:#555">
-<?php do_action( 'wpinv_worldpay_form_before', $invoice ); ?>
-<h3><?php echo $redirect_text ;?></h3>
+<?php do_action('wpinv_worldpay_form_before', $invoice); ?>
+<h3><?php echo $redirect_text; ?></h3>
 <form action="<?php echo wpinv_get_worldpay_redirect(); ?>" name="wpi_worldpay_form" method="POST">
-    <input type="hidden" value="<?php echo $amount;?>" name="amount">
-    <input type="hidden" value="<?php echo esc_attr( $cartId );?>" name="cartId">
-    <input type="hidden" value="<?php echo $currency;?>" name="currency">
-    <input type="hidden" value="<?php echo $instId;?>" name="instId">
-    <input type="hidden" value="<?php echo $testMode;?>" name="testMode">
-    <input type="hidden" value="<?php echo esc_attr( $name );?>" name="name">
-    <input type="hidden" value="<?php echo esc_attr( $address );?>" name="address">
-    <input type="hidden" value="<?php echo esc_attr( $postcode );?>" name="postcode">
-    <input type="hidden" value="<?php echo esc_attr( $tel );?>" name="tel">
-    <input type="hidden" value="<?php echo esc_attr( $email );?>" name="email">
-    <input type="hidden" value="<?php echo esc_attr( $country );?>" name="country">
-    <input type="hidden" value="<?php echo esc_attr( $desc );?>" name="desc">
-    <?php foreach ( $extra_params as $param => $value ) { ?>
-        <?php if ( !empty( $value !== false ) ) { ?>
-    <input type="hidden" value="<?php echo esc_attr( $value );?>" name="<?php echo esc_attr( $param );?>">
+    <input type="hidden" value="<?php echo $amount; ?>" name="amount">
+    <input type="hidden" value="<?php echo esc_attr($cartId); ?>" name="cartId">
+    <input type="hidden" value="<?php echo $currency; ?>" name="currency">
+    <input type="hidden" value="<?php echo $instId; ?>" name="instId">
+    <input type="hidden" value="<?php echo $testMode; ?>" name="testMode">
+    <input type="hidden" value="<?php echo esc_attr($name); ?>" name="name">
+    <input type="hidden" value="<?php echo esc_attr($address); ?>" name="address">
+    <input type="hidden" value="<?php echo esc_attr($postcode); ?>" name="postcode">
+    <input type="hidden" value="<?php echo esc_attr($tel); ?>" name="tel">
+    <input type="hidden" value="<?php echo esc_attr($email); ?>" name="email">
+    <input type="hidden" value="<?php echo esc_attr($country); ?>" name="country">
+    <input type="hidden" value="<?php echo esc_attr($desc); ?>" name="desc">
+    <?php foreach ($extra_params as $param => $value) { ?>
+        <?php if (!empty($value !== false)) { ?>
+    <input type="hidden" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($param); ?>">
         <?php } ?>
     <?php } ?>
-    <?php do_action( 'wpinv_worldpay_form_parameters', $invoice ); ?>
-    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e( 'Pay by Debit/Credit Card (WorldPay)', 'invoicing' ) ;?>">
+    <?php do_action('wpinv_worldpay_form_parameters', $invoice); ?>
+    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e('Pay by Debit/Credit Card (WorldPay)', 'invoicing'); ?>">
 </form>
 <script type="text/javascript">document.wpi_worldpay_form.submit();</script>
-<?php do_action( 'wpinv_worldpay_form_after', $invoice ); ?>
+<?php do_action('wpinv_worldpay_form_after', $invoice); ?>
 </div>
         <?php
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a worldpay payment. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a worldpay 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_worldpay', 'wpinv_process_worldpay_payment' );
+add_action('wpinv_gateway_worldpay', 'wpinv_process_worldpay_payment');
 
 function wpinv_get_worldpay_redirect() {
-    $redirect = wpinv_is_test_mode( 'worldpay' ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+    $redirect = wpinv_is_test_mode('worldpay') ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
     
-    return apply_filters( 'wpinv_worldpay_redirect', $redirect );
+    return apply_filters('wpinv_worldpay_redirect', $redirect);
 }
 
 function wpinv_process_worldpay_ipn() {
-    $request = wpinv_get_post_data( 'post' );
+    $request = wpinv_get_post_data('post');
     
-    if ( !empty( $request['cartId'] ) && !empty( $request['transStatus'] ) && !empty( $request['installation'] ) && isset( $request['testMode'] ) && isset( $request['MC_invoice_id'] ) && isset( $request['MC_key'] ) ) {
+    if (!empty($request['cartId']) && !empty($request['transStatus']) && !empty($request['installation']) && isset($request['testMode']) && isset($request['MC_invoice_id']) && isset($request['MC_key'])) {
         $invoice_id = $request['MC_invoice_id'];
         
-        if ( $invoice_id == wpinv_get_invoice_id_by_key( $request['MC_key'] ) && $invoice = wpinv_get_invoice( $invoice_id ) ) {
-            if ( $request['transStatus'] == 'Y' ) {                
-                wpinv_update_payment_status( $invoice_id, 'publish' );
-                wpinv_set_payment_transaction_id( $invoice_id, $request['transId'] );
-                wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Worldpay Transaction ID: %s', 'invoicing' ), $request['transId'] ) );
+        if ($invoice_id == wpinv_get_invoice_id_by_key($request['MC_key']) && $invoice = wpinv_get_invoice($invoice_id)) {
+            if ($request['transStatus'] == 'Y') {                
+                wpinv_update_payment_status($invoice_id, 'publish');
+                wpinv_set_payment_transaction_id($invoice_id, $request['transId']);
+                wpinv_insert_payment_note($invoice_id, sprintf(__('Worldpay Transaction ID: %s', 'invoicing'), $request['transId']));
                 return;
-            } else if ( $request['transStatus'] == 'C' ) {
-                wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-                wpinv_insert_payment_note( $invoice_id, __( 'Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing' ) );
+            } else if ($request['transStatus'] == 'C') {
+                wpinv_update_payment_status($invoice_id, 'wpi-failed');
+                wpinv_insert_payment_note($invoice_id, __('Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing'));
                 
-                wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing' ), json_encode( $request ) ), $invoice_id );
+                wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing'), json_encode($request)), $invoice_id);
                 return;
             }
         }
     }
     return;
 }
-add_action( 'wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn' );
\ No newline at end of file
+add_action('wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn');
\ No newline at end of file

includes/wpinv-payment-functions.php

Spacing +160 added lines, -160 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-function wpinv_get_subscriptions( $args = array() ) {
-    if ( empty( $args['parent_invoice_id'] ) ) {
+function wpinv_get_subscriptions($args = array()) {
+    if (empty($args['parent_invoice_id'])) {
         return false;
     }
     
@@ -14,18 +14,18 @@ 
     );
 
     $args['post_parent']    = $args['parent_invoice_id'];
-    $args                   = wp_parse_args( $args, $defaults );
+    $args                   = wp_parse_args($args, $defaults);
 
-    if( $args['numberposts'] < 1 ) {
+    if ($args['numberposts'] < 1) {
         $args['numberposts'] = 999999999999;
     }
 
-    $posts          = get_posts( $args );
+    $posts          = get_posts($args);
     $subscriptions  = array();
-    if ( !empty( $posts ) ) {
-        foreach ( $posts as $post ) {
-            if ( !empty( $post->ID ) ) {
-                $subscriptions[] = wpinv_get_invoice( $post->ID );
+    if (!empty($posts)) {
+        foreach ($posts as $post) {
+            if (!empty($post->ID)) {
+                $subscriptions[] = wpinv_get_invoice($post->ID);
             }
         }
     }
@@ -33,19 +33,19 @@ 
     
     return $subscriptions;
 }
-function wpinv_get_subscription( $id = 0, $by_profile_id = false ) {
+function wpinv_get_subscription($id = 0, $by_profile_id = false) {
     global $wpdb;
 
-    if ( empty( $id ) ) {
+    if (empty($id)) {
         return false;
     }
 
-    $id = esc_sql( $id );
+    $id = esc_sql($id);
 
-    $invoice_id = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_profile_id' AND meta_value = '{$id}' LIMIT 1" );
+    $invoice_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_profile_id' AND meta_value = '{$id}' LIMIT 1");
 
-    if ( $invoice_id != null ) {
-        return wpinv_get_invoice( $invoice_id );
+    if ($invoice_id != null) {
+        return wpinv_get_invoice($invoice_id);
     }
 
     return false;
@@ -55,49 +55,49 @@ 
  * Records a new payment on the subscription
  * 
  */
-function wpinv_recurring_add_subscription_payment( $parent_invoice_id, $subscription_args = array() ) {    
-    $args = wp_parse_args( $subscription_args, array(
+function wpinv_recurring_add_subscription_payment($parent_invoice_id, $subscription_args = array()) {    
+    $args = wp_parse_args($subscription_args, array(
         'amount'         => '',
         'transaction_id' => '',
         'gateway'        => ''
-    ) );
+    ));
 
-    if ( wpinv_payment_exists( $args['transaction_id'] ) ) {
+    if (wpinv_payment_exists($args['transaction_id'])) {
         return false;
     }
     
-    $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;
     }
 
     $invoice = new WPInv_Invoice();
-    $invoice->set( 'parent_invoice', $parent_invoice_id );
-    $invoice->set( 'currency', $parent_invoice->get_currency() );
+    $invoice->set('parent_invoice', $parent_invoice_id);
+    $invoice->set('currency', $parent_invoice->get_currency());
     //$invoice->set( 'status', 'publish' );
-    $invoice->set( 'transaction_id', $args['transaction_id'] );
-    $invoice->set( 'key', $parent_invoice->get_key() );
+    $invoice->set('transaction_id', $args['transaction_id']);
+    $invoice->set('key', $parent_invoice->get_key());
     
-    $invoice->set( 'ip', $parent_invoice->ip );
-    $invoice->set( 'user_id', $parent_invoice->get_user_id() );
-    $invoice->set( 'first_name', $parent_invoice->get_first_name() );
-    $invoice->set( 'last_name', $parent_invoice->get_last_name() );
+    $invoice->set('ip', $parent_invoice->ip);
+    $invoice->set('user_id', $parent_invoice->get_user_id());
+    $invoice->set('first_name', $parent_invoice->get_first_name());
+    $invoice->set('last_name', $parent_invoice->get_last_name());
     ///$invoice->set( 'email', $parent_invoice->get_email() );
-    $invoice->set( 'phone', $parent_invoice->phone );
-    $invoice->set( 'address', $parent_invoice->address );
-    $invoice->set( 'city', $parent_invoice->city );
-    $invoice->set( 'country', $parent_invoice->country );
-    $invoice->set( 'state', $parent_invoice->state );
-    $invoice->set( 'zip', $parent_invoice->zip );
-    $invoice->set( 'company', $parent_invoice->company );
-    $invoice->set( 'vat_number', $parent_invoice->vat_number );
-    $invoice->set( 'vat_rate', $parent_invoice->vat_rate );
-    $invoice->set( 'adddress_confirmed', $parent_invoice->adddress_confirmed );
-
-    if ( empty( $args['gateway'] ) ) {
-        $invoice->set( 'gateway', $parent_invoice->get_gateway() );
+    $invoice->set('phone', $parent_invoice->phone);
+    $invoice->set('address', $parent_invoice->address);
+    $invoice->set('city', $parent_invoice->city);
+    $invoice->set('country', $parent_invoice->country);
+    $invoice->set('state', $parent_invoice->state);
+    $invoice->set('zip', $parent_invoice->zip);
+    $invoice->set('company', $parent_invoice->company);
+    $invoice->set('vat_number', $parent_invoice->vat_number);
+    $invoice->set('vat_rate', $parent_invoice->vat_rate);
+    $invoice->set('adddress_confirmed', $parent_invoice->adddress_confirmed);
+
+    if (empty($args['gateway'])) {
+        $invoice->set('gateway', $parent_invoice->get_gateway());
     } else {
-        $invoice->set( 'gateway', $args['gateway'] );
+        $invoice->set('gateway', $args['gateway']);
     }
     
     $recurring_details = $parent_invoice->get_recurring_details();
@@ -105,11 +105,11 @@ 
     // increase the earnings for each item in the subscription
     $items = $recurring_details['cart_details'];
     
-    if ( $items ) {        
+    if ($items) {        
         $add_items      = array();
         $cart_details   = array();
         
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
             $add_item             = array();
             $add_item['id']       = $item['id'];
             $add_item['quantity'] = $item['quantity'];
@@ -119,7 +119,7 @@ 
             break;
         }
         
-        $invoice->set( 'items', $add_items );
+        $invoice->set('items', $add_items);
         $invoice->cart_details = $cart_details;
     }
     
@@ -129,277 +129,277 @@ 
     $tax                = $recurring_details['tax'];
     $discount           = $recurring_details['discount'];
     
-    if ( $discount > 0 ) {
-        $invoice->set( 'discount_code', $parent_invoice->discount_code );
+    if ($discount > 0) {
+        $invoice->set('discount_code', $parent_invoice->discount_code);
     }
     
-    $invoice->subtotal = wpinv_round_amount( $subtotal );
-    $invoice->tax      = wpinv_round_amount( $tax );
-    $invoice->discount = wpinv_round_amount( $discount );
-    $invoice->total    = wpinv_round_amount( $total );
+    $invoice->subtotal = wpinv_round_amount($subtotal);
+    $invoice->tax      = wpinv_round_amount($tax);
+    $invoice->discount = wpinv_round_amount($discount);
+    $invoice->total    = wpinv_round_amount($total);
     $invoice->save();
     
-    wpinv_update_payment_status( $invoice->ID, 'publish' );
+    wpinv_update_payment_status($invoice->ID, 'publish');
     sleep(1);
-    wpinv_update_payment_status( $invoice->ID, 'wpi-renewal' );
+    wpinv_update_payment_status($invoice->ID, 'wpi-renewal');
     
-    $invoice = wpinv_get_invoice( $invoice->ID );
+    $invoice = wpinv_get_invoice($invoice->ID);
     
-    $subscription_data                      = wpinv_payment_subscription_data( $parent_invoice );
+    $subscription_data                      = wpinv_payment_subscription_data($parent_invoice);
     $subscription_data['recurring_amount']  = $invoice->get_total();
-    $subscription_data['created']           = current_time( 'mysql', 0 );
-    $subscription_data['expiration']        = $invoice->get_new_expiration( $subscription_data['item_id'] );
+    $subscription_data['created']           = current_time('mysql', 0);
+    $subscription_data['expiration']        = $invoice->get_new_expiration($subscription_data['item_id']);
     
     // Retrieve pending subscription from database and update it's status to active and set proper profile ID
-    $invoice->update_subscription( $subscription_data );
+    $invoice->update_subscription($subscription_data);
 
-    do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $parent_invoice, $subscription_args );
-    do_action( 'wpinv_recurring_record_payment', $invoice->ID, $parent_invoice_id, $subscription_args );
+    do_action('wpinv_recurring_add_subscription_payment', $invoice, $parent_invoice, $subscription_args);
+    do_action('wpinv_recurring_record_payment', $invoice->ID, $parent_invoice_id, $subscription_args);
 
     return $invoice;
 }
 
-function wpinv_payment_exists( $txn_id = '' ) {
+function wpinv_payment_exists($txn_id = '') {
     global $wpdb;
 
-    if ( empty( $txn_id ) ) {
+    if (empty($txn_id)) {
         return false;
     }
 
-    $txn_id = esc_sql( $txn_id );
+    $txn_id = esc_sql($txn_id);
 
-    $invoice = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1" );
+    $invoice = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1");
 
-    if ( $invoice != null ) {
+    if ($invoice != null) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_is_subscription_payment( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_is_subscription_payment($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
         
-    if ( $invoice->is_renewal() ) {
+    if ($invoice->is_renewal()) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_payment_subscription_data( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_subscription_data($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }    
 
     return $invoice->get_subscription_data();
 }
 
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_link_transaction_id($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+    return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
 }
 
-function wpinv_get_pretty_subscription_period( $period ) {
+function wpinv_get_pretty_subscription_period($period) {
     $frequency = '';
     //Format period details
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $frequency = __( 'Daily', 'invoicing' );
+            $frequency = __('Daily', 'invoicing');
             break;
         case 'W' :
         case 'week' :
-            $frequency = __( 'Weekly', 'invoicing' );
+            $frequency = __('Weekly', 'invoicing');
             break;
         case 'M' :
         case 'month' :
-            $frequency = __( 'Monthly', 'invoicing' );
+            $frequency = __('Monthly', 'invoicing');
             break;
         case 'Y' :
         case 'year' :
-            $frequency = __( 'Yearly', 'invoicing' );
+            $frequency = __('Yearly', 'invoicing');
             break;
         default :
-            $frequency = apply_filters( 'wpinv_pretty_subscription_period', $frequency, $period );
+            $frequency = apply_filters('wpinv_pretty_subscription_period', $frequency, $period);
             break;
     }
 
     return $frequency;
 }
 
-function wpinv_get_pretty_subscription_period_name( $period ) {
+function wpinv_get_pretty_subscription_period_name($period) {
     $frequency = '';
     //Format period details
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $frequency = __( 'Day', 'invoicing' );
+            $frequency = __('Day', 'invoicing');
             break;
         case 'W' :
         case 'week' :
-            $frequency = __( 'Week', 'invoicing' );
+            $frequency = __('Week', 'invoicing');
             break;
         case 'M' :
         case 'month' :
-            $frequency = __( 'Month', 'invoicing' );
+            $frequency = __('Month', 'invoicing');
             break;
         case 'Y' :
         case 'year' :
-            $frequency = __( 'Year', 'invoicing' );
+            $frequency = __('Year', 'invoicing');
             break;
         default :
-            $frequency = apply_filters( 'wpinv_pretty_subscription_period_name', $frequency, $period );
+            $frequency = apply_filters('wpinv_pretty_subscription_period_name', $frequency, $period);
             break;
     }
 
     return $frequency;
 }
 
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
-        $amount = __( 'Free', 'invoicing' );
+    if ($trial_interval > 0 && !empty($trial_period)) {
+        $amount = __('Free', 'invoicing');
         $interval = $trial_interval;
         $period = $trial_period;
     }
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $description = wp_sprintf( _n( '%s for the first day.', '%s for the first %d days.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first day.', '%s for the first %d days.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'W' :
         case 'week' :
-            $description = wp_sprintf( _n( '%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'M' :
         case 'month' :
-            $description = wp_sprintf( _n( '%s for the first month.', '%s for the first %d months.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first month.', '%s for the first %d months.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'Y' :
         case 'year' :
-            $description = wp_sprintf( _n( '%s for the first year.', '%s for the first %d years.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first year.', '%s for the first %d years.', $interval, 'invoicing'), $amount, $interval);
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval  );
+    return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
     $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d days, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d days, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d days.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d days.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'W' :
         case 'week' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d weeks, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d weeks, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d weeks.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d weeks.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each week.', '%s for each %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each week.', '%s for each %d weeks.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'M' :
         case 'month' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d months, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d months, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d months.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d months.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each month.', '%s for each %d months.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each month.', '%s for each %d months.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'Y' :
         case 'year' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d years, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d years, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d years.', 'invoicing'), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d years.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each year.', '%s for each %d years.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each year.', '%s for each %d years.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_payment_desc( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_subscription_payment_desc($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $description = '';
-    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-        if ( $item->has_free_trial() ) {
+    if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
+        if ($item->has_free_trial()) {
             $trial_period = $item->get_trial_period();
             $trial_interval = $item->get_trial_interval();
         } else {
@@ -407,45 +407,45 @@ 
             $trial_interval = 0;
         }
         
-        $description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
+        $description = wpinv_get_billing_cycle($invoice->get_total(), $invoice->get_recurring_details('total'), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency());
     }
     
-    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+    return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
 }
 
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-    $initial_total      = wpinv_round_amount( $initial );
-    $recurring_total    = wpinv_round_amount( $recurring );
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
+    $initial_total      = wpinv_round_amount($initial);
+    $recurring_total    = wpinv_round_amount($recurring);
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
+    if ($trial_interval > 0 && !empty($trial_period)) {
         // Free trial
     } else {
-        if ( $bill_times == 1 ) {
+        if ($bill_times == 1) {
             $recurring_total = $initial_total;
-        } else if ( $bill_times > 1 && $initial_total != $recurring_total ) {
+        } else if ($bill_times > 1 && $initial_total != $recurring_total) {
             $bill_times--;
         }
     }
     
-    $initial_amount     = wpinv_price( wpinv_format_amount( $initial_total ), $currency );
-    $recurring_amount   = wpinv_price( wpinv_format_amount( $recurring_total ), $currency );
+    $initial_amount     = wpinv_price(wpinv_format_amount($initial_total), $currency);
+    $recurring_amount   = wpinv_price(wpinv_format_amount($recurring_total), $currency);
     
-    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
         
-    if ( $initial_total != $recurring_total ) {
-        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+    if ($initial_total != $recurring_total) {
+        $initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
         
-        $description    = wp_sprintf( __( '%s Then %s', 'invoicing' ), $initial, $recurring );
+        $description    = wp_sprintf(__('%s Then %s', 'invoicing'), $initial, $recurring);
     } else {
         $description    = $recurring;
     }
     
-    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+    return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
 }
 
-function wpinv_recurring_send_payment_failed( $invoice ) {
-    if ( !empty( $invoice->ID ) ) {
-        wpinv_failed_invoice_notification( $invoice->ID );
+function wpinv_recurring_send_payment_failed($invoice) {
+    if (!empty($invoice->ID)) {
+        wpinv_failed_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1 );
\ No newline at end of file
+add_action('wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1);
\ No newline at end of file

includes/wpinv-tax-functions.php

Spacing +164 added lines, -164 removed lines

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

includes/wpinv-gateway-functions.php

Spacing +252 added lines, -252 removed lines

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

includes/class-wpinv-item.php

Spacing +118 added lines, -118 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 class WPInv_Item {
     public $ID = 0;
@@ -33,26 +33,26 @@ 
     public $filter;
 
 
-    public function __construct( $_id = false, $_args = array() ) {
-        $item = WP_Post::get_instance( $_id );
-        return $this->setup_item( $item );
+    public function __construct($_id = false, $_args = array()) {
+        $item = WP_Post::get_instance($_id);
+        return $this->setup_item($item);
     }
 
-    private function setup_item( $item ) {
-        if( ! is_object( $item ) ) {
+    private function setup_item($item) {
+        if (!is_object($item)) {
             return false;
         }
 
-        if( ! is_a( $item, 'WP_Post' ) ) {
+        if (!is_a($item, 'WP_Post')) {
             return false;
         }
 
-        if( 'wpi_item' !== $item->post_type ) {
+        if ('wpi_item' !== $item->post_type) {
             return false;
         }
 
-        foreach ( $item as $key => $value ) {
-            switch ( $key ) {
+        foreach ($item as $key => $value) {
+            switch ($key) {
                 default:
                     $this->$key = $value;
                     break;
@@ -62,38 +62,38 @@ 
         return true;
     }
 
-    public function __get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            return call_user_func( array( $this, 'get_' . $key ) );
+    public function __get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            return call_user_func(array($this, 'get_' . $key));
         } else {
-            return new WP_Error( 'wpinv-item-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error('wpinv-item-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
         }
     }
 
-    public function create( $data = array(), $wp_error = false ) {
-        if ( $this->ID != 0 ) {
+    public function create($data = array(), $wp_error = false) {
+        if ($this->ID != 0) {
             return false;
         }
 
         $defaults = array(
             'post_type'   => 'wpi_item',
             'post_status' => 'draft',
-            'post_title'  => __( 'New Invoice Item', 'invoicing' )
+            'post_title'  => __('New Invoice Item', 'invoicing')
         );
 
-        $args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args($data, $defaults);
 
-        do_action( 'wpinv_item_pre_create', $args );
+        do_action('wpinv_item_pre_create', $args);
 
-        $id = wp_insert_post( $args, $wp_error );
+        $id = wp_insert_post($args, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
         
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
@@ -101,47 +101,47 @@ 
         }
         
         // Set custom id if not set.
-        if ( empty( $data['meta']['custom_id'] ) && !$this->get_custom_id() ) {
-            $item->save_metas( array( 'custom_id' => $id ) );
+        if (empty($data['meta']['custom_id']) && !$this->get_custom_id()) {
+            $item->save_metas(array('custom_id' => $id));
         }
 
-        do_action( 'wpinv_item_create', $id, $args );
+        do_action('wpinv_item_create', $id, $args);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
     
-    public function update( $data = array(), $wp_error = false ) {
-        if ( !$this->ID > 0 ) {
+    public function update($data = array(), $wp_error = false) {
+        if (!$this->ID > 0) {
             return false;
         }
         
         $data['ID'] = $this->ID;
 
-        do_action( 'wpinv_item_pre_update', $data );
+        do_action('wpinv_item_pre_update', $data);
         
-        $id = wp_update_post( $data, $wp_error );
+        $id = wp_update_post($data, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
         
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
 
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
             $this->save_metas($data['meta']);
         }
         
         // Set custom id if not set.
-        if ( empty( $data['meta']['custom_id'] ) && !$this->get_custom_id() ) {
-            $item->save_metas( array( 'custom_id' => $id ) );
+        if (empty($data['meta']['custom_id']) && !$this->get_custom_id()) {
+            $item->save_metas(array('custom_id' => $id));
         }
 
-        do_action( 'wpinv_item_update', $id, $data );
+        do_action('wpinv_item_update', $id, $data);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
 
     public function get_ID() {
@@ -149,105 +149,105 @@ 
     }
 
     public function get_name() {
-        return get_the_title( $this->ID );
+        return get_the_title($this->ID);
     }
     
     public function get_summary() {
-        return get_the_excerpt( $this->ID );
+        return get_the_excerpt($this->ID);
     }
 
     public function get_price() {
-        if ( ! isset( $this->price ) ) {
-            $this->price = get_post_meta( $this->ID, '_wpinv_price', true );
+        if (!isset($this->price)) {
+            $this->price = get_post_meta($this->ID, '_wpinv_price', true);
             
-            if ( $this->price ) {
-                $this->price = wpinv_sanitize_amount( $this->price );
+            if ($this->price) {
+                $this->price = wpinv_sanitize_amount($this->price);
             } else {
                 $this->price = 0;
             }
         }
         
-        return apply_filters( 'wpinv_get_item_price', $this->price, $this->ID );
+        return apply_filters('wpinv_get_item_price', $this->price, $this->ID);
     }
     
     public function get_the_price() {
-        $item_price = wpinv_price( wpinv_format_amount( $this->price ) );
+        $item_price = wpinv_price(wpinv_format_amount($this->price));
         
-        return apply_filters( 'wpinv_get_the_item_price', $item_price, $this->ID );
+        return apply_filters('wpinv_get_the_item_price', $item_price, $this->ID);
     }
     
     public function get_vat_rule() {
         global $wpinv_euvat;
         
-        if( !isset( $this->vat_rule ) ) {
-            $this->vat_rule = get_post_meta( $this->ID, '_wpinv_vat_rule', true );
+        if (!isset($this->vat_rule)) {
+            $this->vat_rule = get_post_meta($this->ID, '_wpinv_vat_rule', true);
 
-            if ( empty( $this->vat_rule ) ) {        
+            if (empty($this->vat_rule)) {        
                 $this->vat_rule = $wpinv_euvat->allow_vat_rules() ? 'digital' : 'physical';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_rule', $this->vat_rule, $this->ID );
+        return apply_filters('wpinv_get_item_vat_rule', $this->vat_rule, $this->ID);
     }
     
     public function get_vat_class() {
-        if( !isset( $this->vat_class ) ) {
-            $this->vat_class = get_post_meta( $this->ID, '_wpinv_vat_class', true );
+        if (!isset($this->vat_class)) {
+            $this->vat_class = get_post_meta($this->ID, '_wpinv_vat_class', true);
 
-            if ( empty( $this->vat_class ) ) {        
+            if (empty($this->vat_class)) {        
                 $this->vat_class = '_standard';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_class', $this->vat_class, $this->ID );
+        return apply_filters('wpinv_get_item_vat_class', $this->vat_class, $this->ID);
     }
 
     public function get_type() {
-        if( ! isset( $this->type ) ) {
-            $this->type = get_post_meta( $this->ID, '_wpinv_type', true );
+        if (!isset($this->type)) {
+            $this->type = get_post_meta($this->ID, '_wpinv_type', true);
 
-            if ( empty( $this->type ) ) {
+            if (empty($this->type)) {
                 $this->type = 'custom';
             }
         }
 
-        return apply_filters( 'wpinv_get_item_type', $this->type, $this->ID );
+        return apply_filters('wpinv_get_item_type', $this->type, $this->ID);
     }
     
     public function get_custom_id() {
-        $custom_id = get_post_meta( $this->ID, '_wpinv_custom_id', true );
+        $custom_id = get_post_meta($this->ID, '_wpinv_custom_id', true);
 
-        return apply_filters( 'wpinv_get_item_custom_id', $custom_id, $this->ID );
+        return apply_filters('wpinv_get_item_custom_id', $custom_id, $this->ID);
     }
     
     public function get_custom_name() {
-        $custom_name = get_post_meta( $this->ID, '_wpinv_custom_name', true );
+        $custom_name = get_post_meta($this->ID, '_wpinv_custom_name', true);
 
-        return apply_filters( 'wpinv_get_item_custom_name', $custom_name, $this->ID );
+        return apply_filters('wpinv_get_item_custom_name', $custom_name, $this->ID);
     }
     
     public function get_custom_singular_name() {
-        $custom_singular_name = get_post_meta( $this->ID, '_wpinv_custom_singular_name', true );
+        $custom_singular_name = get_post_meta($this->ID, '_wpinv_custom_singular_name', true);
 
-        return apply_filters( 'wpinv_get_item_custom_singular_name', $custom_singular_name, $this->ID );
+        return apply_filters('wpinv_get_item_custom_singular_name', $custom_singular_name, $this->ID);
     }
     
     public function is_recurring() {
-        $is_recurring = get_post_meta( $this->ID, '_wpinv_is_recurring', true );
+        $is_recurring = get_post_meta($this->ID, '_wpinv_is_recurring', true);
 
-        return (bool)apply_filters( 'wpinv_is_recurring_item', $is_recurring, $this->ID );
+        return (bool)apply_filters('wpinv_is_recurring_item', $is_recurring, $this->ID);
 
     }
     
-    public function get_recurring_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_recurring_period', true );
+    public function get_recurring_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_recurring_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -263,45 +263,45 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_recurring_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_recurring_period', $period, $full, $this->ID);
 
     }
     
     public function get_recurring_interval() {
-        $interval = (int)get_post_meta( $this->ID, '_wpinv_recurring_interval', true );
+        $interval = (int)get_post_meta($this->ID, '_wpinv_recurring_interval', true);
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_recurring_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_recurring_interval', $interval, $this->ID);
 
     }
     
     public function get_recurring_limit() {
-        $limit = get_post_meta( $this->ID, '_wpinv_recurring_limit', true );
+        $limit = get_post_meta($this->ID, '_wpinv_recurring_limit', true);
 
-        return (int)apply_filters( 'wpinv_item_recurring_limit', $limit, $this->ID );
+        return (int)apply_filters('wpinv_item_recurring_limit', $limit, $this->ID);
 
     }
     
     public function has_free_trial() {
-        $free_trial = get_post_meta( $this->ID, '_wpinv_free_trial', true );
-        $free_trial = $this->is_recurring() && !empty( $free_trial ) ? true : false;
+        $free_trial = get_post_meta($this->ID, '_wpinv_free_trial', true);
+        $free_trial = $this->is_recurring() && !empty($free_trial) ? true : false;
 
-        return (bool)apply_filters( 'wpinv_item_has_free_trial', $free_trial, $this->ID );
+        return (bool)apply_filters('wpinv_item_has_free_trial', $free_trial, $this->ID);
 
     }
     
-    public function get_trial_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_trial_period', true );
+    public function get_trial_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_trial_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -317,47 +317,47 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_trial_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_trial_period', $period, $full, $this->ID);
 
     }
     
     public function get_trial_interval() {
-        $interval = absint( get_post_meta( $this->ID, '_wpinv_trial_interval', true ) );
+        $interval = absint(get_post_meta($this->ID, '_wpinv_trial_interval', true));
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_trial_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_trial_interval', $interval, $this->ID);
 
     }
 
     public function is_free() {
         $is_free = false;
         
-        $price = get_post_meta( $this->ID, '_wpinv_price', true );
+        $price = get_post_meta($this->ID, '_wpinv_price', true);
 
-        if ( (float)$price == 0 ) {
+        if ((float)$price == 0) {
             $is_free = true;
         }
 
-        return (bool) apply_filters( 'wpinv_is_free_item', $is_free, $this->ID );
+        return (bool)apply_filters('wpinv_is_free_item', $is_free, $this->ID);
 
     }
     
     public function is_package() {
         $is_package = $this->get_type() == 'package' ? true : false;
 
-        return (bool) apply_filters( 'wpinv_is_package_item', $is_package, $this->ID );
+        return (bool)apply_filters('wpinv_is_package_item', $is_package, $this->ID);
 
     }
     
-    public function save_metas( $metas = array() ) {
-        if ( empty( $metas ) ) {
+    public function save_metas($metas = array()) {
+        if (empty($metas)) {
             return false;
         }
         
-        foreach ( $metas as $meta_key => $meta_value ) {
+        foreach ($metas as $meta_key => $meta_value) {
             $meta_key = strpos($meta_key, '_wpinv_') !== 0 ? '_wpinv_' . $meta_key : $meta_key;
             
             $this->update_meta($meta_key, $meta_value);
@@ -366,66 +366,66 @@ 
         return true;
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
         
-        $meta_value = apply_filters( 'wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID );
+        $meta_value = apply_filters('wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID);
 
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
     
-    public function get_fees( $type = 'fee', $item_id = 0 ) {
+    public function get_fees($type = 'fee', $item_id = 0) {
         global $wpi_session;
         
-        $fees = $wpi_session->get( 'wpi_cart_fees' );
+        $fees = $wpi_session->get('wpi_cart_fees');
 
-        if ( ! wpinv_get_cart_contents() ) {
+        if (!wpinv_get_cart_contents()) {
             // We can only get item type fees when the cart is empty
             $type = 'custom';
         }
 
-        if ( ! empty( $fees ) && ! empty( $type ) && 'all' !== $type ) {
-            foreach( $fees as $key => $fee ) {
-                if( ! empty( $fee['type'] ) && $type != $fee['type'] ) {
-                    unset( $fees[ $key ] );
+        if (!empty($fees) && !empty($type) && 'all' !== $type) {
+            foreach ($fees as $key => $fee) {
+                if (!empty($fee['type']) && $type != $fee['type']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) && ! empty( $item_id ) ) {
+        if (!empty($fees) && !empty($item_id)) {
             // Remove fees that don't belong to the specified Item
-            foreach ( $fees as $key => $fee ) {
-                if ( (int) $item_id !== (int)$fee['custom_id'] ) {
-                    unset( $fees[ $key ] );
+            foreach ($fees as $key => $fee) {
+                if ((int)$item_id !== (int)$fee['custom_id']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) ) {
+        if (!empty($fees)) {
             // Remove fees that belong to a specific item but are not in the cart
-            foreach( $fees as $key => $fee ) {
-                if( empty( $fee['custom_id'] ) ) {
+            foreach ($fees as $key => $fee) {
+                if (empty($fee['custom_id'])) {
                     continue;
                 }
 
-                if ( !wpinv_item_in_cart( $fee['custom_id'] ) ) {
-                    unset( $fees[ $key ] );
+                if (!wpinv_item_in_cart($fee['custom_id'])) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        return ! empty( $fees ) ? $fees : array();
+        return !empty($fees) ? $fees : array();
     }
     
     public function can_purchase() {
         $can_purchase = true;
 
-        if ( !current_user_can( 'edit_post', $this->ID ) && $this->post_status != 'publish' ) {
+        if (!current_user_can('edit_post', $this->ID) && $this->post_status != 'publish') {
             $can_purchase = false;
         }
 
-        return (bool)apply_filters( 'wpinv_can_purchase_item', $can_purchase, $this );
+        return (bool)apply_filters('wpinv_can_purchase_item', $can_purchase, $this);
     }
 }

includes/wpinv-general-functions.php

Spacing +153 added lines, -153 removed lines

@@ -7,195 +7,195 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_is_checkout() {
     global $wp_query;
 
-    $is_object_set    = isset( $wp_query->queried_object );
-    $is_object_id_set = isset( $wp_query->queried_object_id );
-    $is_checkout      = is_page( wpinv_get_option( 'checkout_page' ) );
+    $is_object_set    = isset($wp_query->queried_object);
+    $is_object_id_set = isset($wp_query->queried_object_id);
+    $is_checkout      = is_page(wpinv_get_option('checkout_page'));
 
-    if ( !$is_object_set ) {
-        unset( $wp_query->queried_object );
+    if (!$is_object_set) {
+        unset($wp_query->queried_object);
     }
 
-    if ( !$is_object_id_set ) {
-        unset( $wp_query->queried_object_id );
+    if (!$is_object_id_set) {
+        unset($wp_query->queried_object_id);
     }
 
-    return apply_filters( 'wpinv_is_checkout', $is_checkout );
+    return apply_filters('wpinv_is_checkout', $is_checkout);
 }
 
 function wpinv_can_checkout() {
 	$can_checkout = true; // Always true for now
 
-	return (bool) apply_filters( 'wpinv_can_checkout', $can_checkout );
+	return (bool)apply_filters('wpinv_can_checkout', $can_checkout);
 }
 
 function wpinv_get_success_page_uri() {
-	$page_id = wpinv_get_option( 'success_page', 0 );
-	$page_id = absint( $page_id );
+	$page_id = wpinv_get_option('success_page', 0);
+	$page_id = absint($page_id);
 
-	return apply_filters( 'wpinv_get_success_page_uri', get_permalink( $page_id ) );
+	return apply_filters('wpinv_get_success_page_uri', get_permalink($page_id));
 }
 
 function wpinv_get_history_page_uri() {
-	$page_id = wpinv_get_option( 'invoice_history_page', 0 );
-	$page_id = absint( $page_id );
+	$page_id = wpinv_get_option('invoice_history_page', 0);
+	$page_id = absint($page_id);
 
-	return apply_filters( 'wpinv_get_history_page_uri', get_permalink( $page_id ) );
+	return apply_filters('wpinv_get_history_page_uri', get_permalink($page_id));
 }
 
 function wpinv_is_success_page() {
-	$is_success_page = wpinv_get_option( 'success_page', false );
-	$is_success_page = isset( $is_success_page ) ? is_page( $is_success_page ) : false;
+	$is_success_page = wpinv_get_option('success_page', false);
+	$is_success_page = isset($is_success_page) ? is_page($is_success_page) : false;
 
-	return apply_filters( 'wpinv_is_success_page', $is_success_page );
+	return apply_filters('wpinv_is_success_page', $is_success_page);
 }
 
 function wpinv_is_invoice_history_page() {
-	$ret = wpinv_get_option( 'invoice_history_page', false );
-	$ret = $ret ? is_page( $ret ) : false;
-	return apply_filters( 'wpinv_is_invoice_history_page', $ret );
+	$ret = wpinv_get_option('invoice_history_page', false);
+	$ret = $ret ? is_page($ret) : false;
+	return apply_filters('wpinv_is_invoice_history_page', $ret);
 }
 
-function wpinv_send_to_success_page( $args = null ) {
+function wpinv_send_to_success_page($args = null) {
 	$redirect = wpinv_get_success_page_uri();
     
-    if ( !empty( $args ) ) {
+    if (!empty($args)) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if (is_string($args))
+            $args = str_replace('?', '', $args);
 
-        $args = wp_parse_args( $args );
+        $args = wp_parse_args($args);
 
-        $redirect = add_query_arg( $args, $redirect );
+        $redirect = add_query_arg($args, $redirect);
     }
 
-    $gateway = isset( $_REQUEST['wpi-gateway'] ) ? $_REQUEST['wpi-gateway'] : '';
+    $gateway = isset($_REQUEST['wpi-gateway']) ? $_REQUEST['wpi-gateway'] : '';
     
-    $redirect = apply_filters( 'wpinv_success_page_redirect', $redirect, $gateway, $args );
-    wp_redirect( $redirect );
+    $redirect = apply_filters('wpinv_success_page_redirect', $redirect, $gateway, $args);
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_send_to_failed_page( $args = null ) {
+function wpinv_send_to_failed_page($args = null) {
 	$redirect = wpinv_get_failed_transaction_uri();
     
-    if ( !empty( $args ) ) {
+    if (!empty($args)) {
         // Check for backward compatibility
-        if ( is_string( $args ) )
-            $args = str_replace( '?', '', $args );
+        if (is_string($args))
+            $args = str_replace('?', '', $args);
 
-        $args = wp_parse_args( $args );
+        $args = wp_parse_args($args);
 
-        $redirect = add_query_arg( $args, $redirect );
+        $redirect = add_query_arg($args, $redirect);
     }
 
-    $gateway = isset( $_REQUEST['wpi-gateway'] ) ? $_REQUEST['wpi-gateway'] : '';
+    $gateway = isset($_REQUEST['wpi-gateway']) ? $_REQUEST['wpi-gateway'] : '';
     
-    $redirect = apply_filters( 'wpinv_failed_page_redirect', $redirect, $gateway, $args );
-    wp_redirect( $redirect );
+    $redirect = apply_filters('wpinv_failed_page_redirect', $redirect, $gateway, $args);
+    wp_redirect($redirect);
     exit;
 }
 
-function wpinv_get_checkout_uri( $args = array() ) {
-	$uri = wpinv_get_option( 'checkout_page', false );
-	$uri = isset( $uri ) ? get_permalink( $uri ) : NULL;
+function wpinv_get_checkout_uri($args = array()) {
+	$uri = wpinv_get_option('checkout_page', false);
+	$uri = isset($uri) ? get_permalink($uri) : NULL;
 
-	if ( !empty( $args ) ) {
+	if (!empty($args)) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if (is_string($args))
+			$args = str_replace('?', '', $args);
 
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
-		$uri = add_query_arg( $args, $uri );
+		$uri = add_query_arg($args, $uri);
 	}
 
-	$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
+	$scheme = defined('FORCE_SSL_ADMIN') && FORCE_SSL_ADMIN ? 'https' : 'admin';
 
-	$ajax_url = admin_url( 'admin-ajax.php', $scheme );
+	$ajax_url = admin_url('admin-ajax.php', $scheme);
 
-	if ( ( ! preg_match( '/^https/', $uri ) && preg_match( '/^https/', $ajax_url ) ) || wpinv_is_ssl_enforced() ) {
-		$uri = preg_replace( '/^http:/', 'https:', $uri );
+	if ((!preg_match('/^https/', $uri) && preg_match('/^https/', $ajax_url)) || wpinv_is_ssl_enforced()) {
+		$uri = preg_replace('/^http:/', 'https:', $uri);
 	}
 
-	return apply_filters( 'wpinv_get_checkout_uri', $uri );
+	return apply_filters('wpinv_get_checkout_uri', $uri);
 }
 
-function wpinv_send_back_to_checkout( $args = array() ) {
+function wpinv_send_back_to_checkout($args = array()) {
 	$redirect = wpinv_get_checkout_uri();
 
-	if ( ! empty( $args ) ) {
+	if (!empty($args)) {
 		// Check for backward compatibility
-		if ( is_string( $args ) )
-			$args = str_replace( '?', '', $args );
+		if (is_string($args))
+			$args = str_replace('?', '', $args);
 
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
-		$redirect = add_query_arg( $args, $redirect );
+		$redirect = add_query_arg($args, $redirect);
 	}
 
-	wp_redirect( apply_filters( 'wpinv_send_back_to_checkout', $redirect, $args ) );
+	wp_redirect(apply_filters('wpinv_send_back_to_checkout', $redirect, $args));
 	exit;
 }
 
-function wpinv_get_success_page_url( $query_string = null ) {
-	$success_page = wpinv_get_option( 'success_page', 0 );
-	$success_page = get_permalink( $success_page );
+function wpinv_get_success_page_url($query_string = null) {
+	$success_page = wpinv_get_option('success_page', 0);
+	$success_page = get_permalink($success_page);
 
-	if ( $query_string )
+	if ($query_string)
 		$success_page .= $query_string;
 
-	return apply_filters( 'wpinv_success_page_url', $success_page );
+	return apply_filters('wpinv_success_page_url', $success_page);
 }
 
-function wpinv_get_failed_transaction_uri( $extras = false ) {
-	$uri = wpinv_get_option( 'failure_page', '' );
-	$uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
+function wpinv_get_failed_transaction_uri($extras = false) {
+	$uri = wpinv_get_option('failure_page', '');
+	$uri = !empty($uri) ? trailingslashit(get_permalink($uri)) : home_url();
 
-	if ( $extras )
+	if ($extras)
 		$uri .= $extras;
 
-	return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
+	return apply_filters('wpinv_get_failed_transaction_uri', $uri);
 }
 
 function wpinv_is_failed_transaction_page() {
-	$ret = wpinv_get_option( 'failure_page', false );
-	$ret = isset( $ret ) ? is_page( $ret ) : false;
+	$ret = wpinv_get_option('failure_page', false);
+	$ret = isset($ret) ? is_page($ret) : false;
 
-	return apply_filters( 'wpinv_is_failure_page', $ret );
+	return apply_filters('wpinv_is_failure_page', $ret);
 }
 
-function wpinv_transaction_query( $type = 'start' ) {
+function wpinv_transaction_query($type = 'start') {
     global $wpdb;
 
     $wpdb->hide_errors();
 
-    if ( ! defined( 'WPINV_USE_TRANSACTIONS' ) ) {
-        define( 'WPINV_USE_TRANSACTIONS', true );
+    if (!defined('WPINV_USE_TRANSACTIONS')) {
+        define('WPINV_USE_TRANSACTIONS', true);
     }
 
-    if ( WPINV_USE_TRANSACTIONS ) {
-        switch ( $type ) {
+    if (WPINV_USE_TRANSACTIONS) {
+        switch ($type) {
             case 'commit' :
-                $wpdb->query( 'COMMIT' );
+                $wpdb->query('COMMIT');
                 break;
             case 'rollback' :
-                $wpdb->query( 'ROLLBACK' );
+                $wpdb->query('ROLLBACK');
                 break;
             default :
-                $wpdb->query( 'START TRANSACTION' );
+                $wpdb->query('START TRANSACTION');
             break;
         }
     }
 }
 
-function wpinv_create_invoice( $args = array(), $data = array(), $wp_error = false ) {
+function wpinv_create_invoice($args = array(), $data = array(), $wp_error = false) {
     $default_args = array(
         'status'        => '',
         'user_id'       => null,
@@ -205,72 +205,72 @@ 
         'parent'        => 0
     );
 
-    $args           = wp_parse_args( $args, $default_args );
+    $args           = wp_parse_args($args, $default_args);
     $invoice_data   = array();
 
-    if ( $args['invoice_id'] > 0 ) {
-        $updating           = true;
+    if ($args['invoice_id'] > 0) {
+        $updating = true;
         $invoice_data['post_type']  = 'wpi_invoice';
         $invoice_data['ID']         = $args['invoice_id'];
     } else {
         $updating                       = false;
         $invoice_data['post_type']      = 'wpi_invoice';
-        $invoice_data['post_status']    = apply_filters( 'wpinv_default_invoice_status', 'pending' );
+        $invoice_data['post_status']    = apply_filters('wpinv_default_invoice_status', 'pending');
         $invoice_data['ping_status']    = 'closed';
-        $invoice_data['post_author']    = !empty( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
-        $invoice_data['post_title']     = wpinv_format_invoice_number( '0' );
-        $invoice_data['post_parent']    = absint( $args['parent'] );
-        if ( !empty( $args['created_date'] ) ) {
+        $invoice_data['post_author']    = !empty($args['user_id']) ? $args['user_id'] : get_current_user_id();
+        $invoice_data['post_title']     = wpinv_format_invoice_number('0');
+        $invoice_data['post_parent']    = absint($args['parent']);
+        if (!empty($args['created_date'])) {
             $invoice_data['post_date']      = $args['created_date'];
-            $invoice_data['post_date_gmt']  = get_gmt_from_date( $args['created_date'] );
+            $invoice_data['post_date_gmt']  = get_gmt_from_date($args['created_date']);
         }
     }
 
-    if ( $args['status'] ) {
-        if ( ! in_array( $args['status'], array_keys( wpinv_get_invoice_statuses() ) ) ) {
-            return new WP_Error( 'wpinv_invalid_invoice_status', wp_sprintf( __( 'Invalid invoice status: %s', 'invoicing' ), $args['status'] ) );
+    if ($args['status']) {
+        if (!in_array($args['status'], array_keys(wpinv_get_invoice_statuses()))) {
+            return new WP_Error('wpinv_invalid_invoice_status', wp_sprintf(__('Invalid invoice status: %s', 'invoicing'), $args['status']));
         }
-        $invoice_data['post_status']    = $args['status'];
+        $invoice_data['post_status'] = $args['status'];
     }
 
-    if ( ! is_null( $args['user_note'] ) ) {
-        $invoice_data['post_excerpt']   = $args['user_note'];
+    if (!is_null($args['user_note'])) {
+        $invoice_data['post_excerpt'] = $args['user_note'];
     }
 
-    if ( $updating ) {
-        $invoice_id = wp_update_post( $invoice_data, true );
+    if ($updating) {
+        $invoice_id = wp_update_post($invoice_data, true);
     } else {
-        $invoice_id = wp_insert_post( apply_filters( 'wpinv_new_invoice_data', $invoice_data ), true );
+        $invoice_id = wp_insert_post(apply_filters('wpinv_new_invoice_data', $invoice_data), true);
     }
 
-    if ( is_wp_error( $invoice_id ) ) {
+    if (is_wp_error($invoice_id)) {
         return $wp_error ? $invoice_id : 0;
     } else {
-        if ( !$updating ) {
-            $invoice_number = wpinv_format_invoice_number( $invoice_id );
+        if (!$updating) {
+            $invoice_number = wpinv_format_invoice_number($invoice_id);
             
-            $update = array( 'ID' => $invoice_id, 'post_title' => $invoice_number, 'post_name' => sanitize_title( $invoice_number ) );
-            wp_update_post( $update );
+            $update = array('ID' => $invoice_id, 'post_title' => $invoice_number, 'post_name' => sanitize_title($invoice_number));
+            wp_update_post($update);
             
-            update_post_meta( $invoice_id, '_wpinv_number', $invoice_number );
+            update_post_meta($invoice_id, '_wpinv_number', $invoice_number);
         }
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-
-    if ( !$updating ) {
-        update_post_meta( $invoice_id, '_wpinv_key', apply_filters( 'wpinv_generate_invoice_key', uniqid( 'wpinv_' ) ) );
-        update_post_meta( $invoice_id, '_wpinv_currency', wpinv_get_currency() );
-        update_post_meta( $invoice_id, '_wpinv_include_tax', get_option( 'wpinv_prices_include_tax' ) );
-        update_post_meta( $invoice_id, '_wpinv_user_ip', wpinv_get_ip() );
-        update_post_meta( $invoice_id, '_wpinv_user_agent', wpinv_get_user_agent() );
-        update_post_meta( $invoice_id, '_wpinv_created_via', sanitize_text_field( $args['created_via'] ) );
+    $invoice = wpinv_get_invoice($invoice_id);
+
+    if (!$updating) {
+        update_post_meta($invoice_id, '_wpinv_key', apply_filters('wpinv_generate_invoice_key', uniqid('wpinv_')));
+        update_post_meta($invoice_id, '_wpinv_currency', wpinv_get_currency());
+        update_post_meta($invoice_id, '_wpinv_include_tax', get_option('wpinv_prices_include_tax'));
+        update_post_meta($invoice_id, '_wpinv_user_ip', wpinv_get_ip());
+        update_post_meta($invoice_id, '_wpinv_user_agent', wpinv_get_user_agent());
+        update_post_meta($invoice_id, '_wpinv_created_via', sanitize_text_field($args['created_via']));
         
         // Add invoice note
-        $invoice->add_note( wp_sprintf( __( 'Invoice is created with status %s.', 'invoicing' ), wpinv_status_nicename( $invoice->status ) ) );
+        $invoice->add_note(wp_sprintf(__('Invoice is created with status %s.', 'invoicing'), wpinv_status_nicename($invoice->status)));
     }
 
-    update_post_meta( $invoice_id, '_wpinv_version', WPINV_VERSION );
+    update_post_meta($invoice_id, '_wpinv_version', WPINV_VERSION);
 
     return $invoice;
 }
@@ -278,118 +278,118 @@ 
 function wpinv_get_prefix() {
     $invoice_prefix = 'INV-';
     
-    return apply_filters( 'wpinv_get_prefix', $invoice_prefix );
+    return apply_filters('wpinv_get_prefix', $invoice_prefix);
 }
 
 function wpinv_get_business_logo() {
-    $business_logo = wpinv_get_option( 'logo' );
-    return apply_filters( 'wpinv_get_business_logo', $business_logo );
+    $business_logo = wpinv_get_option('logo');
+    return apply_filters('wpinv_get_business_logo', $business_logo);
 }
 
 function wpinv_get_business_name() {
     $business_name = wpinv_get_option('store_name');
-    return apply_filters( 'wpinv_get_business_name', $business_name );
+    return apply_filters('wpinv_get_business_name', $business_name);
 }
 
 function wpinv_get_blogname() {
-    return wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    return wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 }
 
 function wpinv_get_admin_email() {
-    $admin_email = get_option( 'admin_email' );
-    return apply_filters( 'wpinv_admin_email', $admin_email );
+    $admin_email = get_option('admin_email');
+    return apply_filters('wpinv_admin_email', $admin_email);
 }
 
 function wpinv_get_business_website() {
-    $business_website = home_url( '/' );
-    return apply_filters( 'wpinv_get_business_website', $business_website );
+    $business_website = home_url('/');
+    return apply_filters('wpinv_get_business_website', $business_website);
 }
 
-function wpinv_get_terms_text( $invoice_id = 0 ) {
+function wpinv_get_terms_text($invoice_id = 0) {
     $terms_text = '';
-    return apply_filters( 'wpinv_get_terms_text', $terms_text, $invoice_id );
+    return apply_filters('wpinv_get_terms_text', $terms_text, $invoice_id);
 }
 
 function wpinv_get_business_footer() {
-    $site_link = '<a target="_blank" href="' . esc_url( wpinv_get_business_website() ) . '">' . esc_html( wpinv_get_business_name() ) . '</a>';
-    $business_footer = wp_sprintf( __( 'Thanks for using %s', 'invoicing' ), $site_link );
-    return apply_filters( 'wpinv_get_business_footer', $business_footer );
+    $site_link = '<a target="_blank" href="' . esc_url(wpinv_get_business_website()) . '">' . esc_html(wpinv_get_business_name()) . '</a>';
+    $business_footer = wp_sprintf(__('Thanks for using %s', 'invoicing'), $site_link);
+    return apply_filters('wpinv_get_business_footer', $business_footer);
 }
 
 function wpinv_checkout_required_fields() {
     $required_fields = array();
     
     // Let payment gateways and other extensions determine if address fields should be required
-    $require_billing_details = apply_filters( 'wpinv_checkout_required_billing_details', wpinv_use_taxes() );
+    $require_billing_details = apply_filters('wpinv_checkout_required_billing_details', wpinv_use_taxes());
     
-    if ( $require_billing_details ) {
+    if ($require_billing_details) {
         ///$required_fields['email'] = array(
                 ///'error_id' => 'invalid_email',
                 ///'error_message' => __( 'Please enter a valid email address', 'invoicing' )
             ///);
         $required_fields['first_name'] = array(
                 'error_id' => 'invalid_first_name',
-                'error_message' => __( 'Please enter your first name', 'invoicing' )
+                'error_message' => __('Please enter your first name', 'invoicing')
             );
         $required_fields['address'] = array(
                 'error_id' => 'invalid_address',
-                'error_message' => __( 'Please enter your address', 'invoicing' )
+                'error_message' => __('Please enter your address', 'invoicing')
             );
         $required_fields['city'] = array(
                 'error_id' => 'invalid_city',
-                'error_message' => __( 'Please enter your billing city', 'invoicing' )
+                'error_message' => __('Please enter your billing city', 'invoicing')
             );
         $required_fields['state'] = array(
                 'error_id' => 'invalid_state',
-                'error_message' => __( 'Please enter billing state / province', 'invoicing' )
+                'error_message' => __('Please enter billing state / province', 'invoicing')
             );
         $required_fields['country'] = array(
                 'error_id' => 'invalid_country',
-                'error_message' => __( 'Please select your billing country', 'invoicing' )
+                'error_message' => __('Please select your billing country', 'invoicing')
             );
     }
 
-    return apply_filters( 'wpinv_checkout_required_fields', $required_fields );
+    return apply_filters('wpinv_checkout_required_fields', $required_fields);
 }
 
 function wpinv_is_ssl_enforced() {
-    $ssl_enforced = wpinv_get_option( 'enforce_ssl', false );
-    return (bool) apply_filters( 'wpinv_is_ssl_enforced', $ssl_enforced );
+    $ssl_enforced = wpinv_get_option('enforce_ssl', false);
+    return (bool)apply_filters('wpinv_is_ssl_enforced', $ssl_enforced);
 }
 
-function wpinv_user_can_print_invoice( $post ) {
+function wpinv_user_can_print_invoice($post) {
     $allow = false;
     
-    if ( !( $user_id = get_current_user_id() ) ) {
+    if (!($user_id = get_current_user_id())) {
         return $allow;
     }
     
-    if ( is_int( $post ) ) {
-        $post = get_post( $post );
+    if (is_int($post)) {
+        $post = get_post($post);
     }
     
     // Allow to owner.
-    if ( is_object( $post ) && !empty( $post->post_author ) && $post->post_author == $user_id ) {
+    if (is_object($post) && !empty($post->post_author) && $post->post_author == $user_id) {
         $allow = true;
     }
     
     // Allow to admin user.
-    if ( current_user_can( 'manage_options' ) ) {
+    if (current_user_can('manage_options')) {
         $allow = true;
     }
     
-    return apply_filters( 'wpinv_can_print_invoice', $allow, $post );
+    return apply_filters('wpinv_can_print_invoice', $allow, $post);
 }
 
 function wpinv_schedule_events() {
     // hourly, daily and twicedaily
-    if ( !wp_next_scheduled( 'wpinv_register_schedule_event_twicedaily' ) ) {
-        wp_schedule_event( current_time( 'timestamp' ), 'twicedaily', 'wpinv_register_schedule_event_twicedaily' );
+    if (!wp_next_scheduled('wpinv_register_schedule_event_twicedaily')) {
+        wp_schedule_event(current_time('timestamp'), 'twicedaily', 'wpinv_register_schedule_event_twicedaily');
     }
 }
-add_action( 'wp', 'wpinv_schedule_events' );
+add_action('wp', 'wpinv_schedule_events');
 
 function wpinv_schedule_event_twicedaily() {
     wpinv_email_payment_reminders();
 }
-add_action( 'wpinv_register_schedule_event_twicedaily', 'wpinv_schedule_event_twicedaily' );
\ No newline at end of file
+add_action('wpinv_register_schedule_event_twicedaily', 'wpinv_schedule_event_twicedaily');
\ No newline at end of file

includes/wpinv-gd-functions.php

Spacing +265 added lines, -265 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_gd_active() {
-    return (bool)defined( 'GEODIRECTORY_VERSION' );
+    return (bool)defined('GEODIRECTORY_VERSION');
 }
 
 function wpinv_pm_active() {
-    return (bool)wpinv_gd_active() && (bool)defined( 'GEODIRPAYMENT_VERSION' );
+    return (bool)wpinv_gd_active() && (bool)defined('GEODIRPAYMENT_VERSION');
 }
 
-function wpinv_is_gd_post_type( $post_type ) {
+function wpinv_is_gd_post_type($post_type) {
     global $gd_posttypes;
     
-    $gd_posttypes = !empty( $gd_posttypes ) && is_array( $gd_posttypes ) ? $gd_posttypes : geodir_get_posttypes();
+    $gd_posttypes = !empty($gd_posttypes) && is_array($gd_posttypes) ? $gd_posttypes : geodir_get_posttypes();
     
-    if ( !empty( $post_type ) && !empty( $gd_posttypes ) && in_array( $post_type, $gd_posttypes ) ) {
+    if (!empty($post_type) && !empty($gd_posttypes) && in_array($post_type, $gd_posttypes)) {
         return true;
     }
     
@@ -29,10 +29,10 @@ 
         return;
     }
     
-    if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
+    if (!(defined('DOING_AJAX') && DOING_AJAX)) {
         // Add  fields for force upgrade
-        if ( defined('INVOICE_TABLE') && !get_option('wpinv_gdp_column') ) {
-            geodir_add_column_if_not_exist( INVOICE_TABLE, 'invoice_id', 'INT( 11 ) NOT NULL DEFAULT 0' );
+        if (defined('INVOICE_TABLE') && !get_option('wpinv_gdp_column')) {
+            geodir_add_column_if_not_exist(INVOICE_TABLE, 'invoice_id', 'INT( 11 ) NOT NULL DEFAULT 0');
             
             update_option('wpinv_gdp_column', '1');
         }
@@ -40,39 +40,39 @@ 
         wpinv_merge_gd_packages_to_items();
     }
 }
-add_action( 'admin_init', 'wpinv_geodir_integration' );
+add_action('admin_init', 'wpinv_geodir_integration');
 
-function wpinv_get_gdp_package_type( $item_types ) {
-    if ( wpinv_pm_active() ) {
-        $item_types['package'] = __( 'Package', 'invoicing' );
+function wpinv_get_gdp_package_type($item_types) {
+    if (wpinv_pm_active()) {
+        $item_types['package'] = __('Package', 'invoicing');
     }
         
     return $item_types;
 }
-add_filter( 'wpinv_get_item_types', 'wpinv_get_gdp_package_type', 10, 1 );
+add_filter('wpinv_get_item_types', 'wpinv_get_gdp_package_type', 10, 1);
 
 function wpinv_update_package_item($package_id) {
     return wpinv_merge_gd_package_to_item($package_id, true);
 }
 add_action('geodir_after_save_package', 'wpinv_update_package_item', 10, 1);
 
-function wpinv_merge_gd_packages_to_items( $force = false ) {    
-    if ( $merged = get_option( 'wpinv_merge_gd_packages' ) && !$force ) {
+function wpinv_merge_gd_packages_to_items($force = false) {    
+    if ($merged = get_option('wpinv_merge_gd_packages') && !$force) {
         return true;
     }
 
-    if(!function_exists('geodir_package_list_info')){
+    if (!function_exists('geodir_package_list_info')) {
         return false;
     }
     
     $packages = geodir_package_list_info();
     
-    foreach ( $packages as $key => $package ) {
-        wpinv_merge_gd_package_to_item( $package->pid, $force, $package );
+    foreach ($packages as $key => $package) {
+        wpinv_merge_gd_package_to_item($package->pid, $force, $package);
     }
     
-    if ( !$merged ) {
-        update_option( 'wpinv_merge_gd_packages', 1 );
+    if (!$merged) {
+        update_option('wpinv_merge_gd_packages', 1);
     }
     
     return true;
@@ -101,7 +101,7 @@ 
 
     $package = empty($package) ? geodir_get_package_info_by_id($package_id, '') : $package;
 
-    if ( empty($package) || !wpinv_is_gd_post_type( $package->post_type ) ) {
+    if (empty($package) || !wpinv_is_gd_post_type($package->post_type)) {
         return false;
     }
         
@@ -110,17 +110,17 @@ 
     $meta['custom_id']              = $package_id;
     $meta['custom_singular_name']   = get_post_type_singular_label($package->post_type);
     $meta['custom_name']            = get_post_type_plural_label($package->post_type);
-    $meta['price']                  = wpinv_round_amount( $package->amount );
+    $meta['price']                  = wpinv_round_amount($package->amount);
     $meta['vat_rule']               = 'digital';
     $meta['vat_class']              = '_standard';
     
-    if ( !empty( $package->sub_active ) ) {
-        $sub_num_trial_days = absint( $package->sub_num_trial_days );
+    if (!empty($package->sub_active)) {
+        $sub_num_trial_days = absint($package->sub_num_trial_days);
         
         $meta['is_recurring']       = 1;
         $meta['recurring_period']   = $package->sub_units;
-        $meta['recurring_interval'] = absint( $package->sub_units_num );
-        $meta['recurring_limit']    = absint( $package->sub_units_num_times );
+        $meta['recurring_interval'] = absint($package->sub_units_num);
+        $meta['recurring_limit']    = absint($package->sub_units_num_times);
         $meta['free_trial']         = $sub_num_trial_days > 0 ? 1 : 0;
         $meta['trial_period']       = $package->sub_num_trial_units;
         $meta['trial_interval']     = $sub_num_trial_days;
@@ -134,7 +134,7 @@ 
         $meta['trial_interval']     = '';
     }
     
-    $data  = array( 
+    $data = array( 
         'post_title'    => $package->title,
         'post_excerpt'  => $package->title_desc,
         'post_status'   => $package->status == 1 ? 'publish' : 'pending',
@@ -151,48 +151,48 @@ 
     return $item;
 }
 
-function wpinv_gdp_to_wpi_gateway( $payment_method ) {
-    switch( $payment_method ) {
+function wpinv_gdp_to_wpi_gateway($payment_method) {
+    switch ($payment_method) {
         case 'prebanktransfer':
             $gateway = 'bank_transfer';
         break;
         default:
-            $gateway = empty( $payment_method ) ? 'manual' : $payment_method;
+            $gateway = empty($payment_method) ? 'manual' : $payment_method;
         break;
     }
     
-    return apply_filters( 'wpinv_gdp_to_wpi_gateway', $gateway, $payment_method );
+    return apply_filters('wpinv_gdp_to_wpi_gateway', $gateway, $payment_method);
 }
 
-function wpinv_gdp_to_wpi_gateway_title( $payment_method ) {
-    $gateway = wpinv_gdp_to_wpi_gateway( $payment_method );
+function wpinv_gdp_to_wpi_gateway_title($payment_method) {
+    $gateway = wpinv_gdp_to_wpi_gateway($payment_method);
     
-    $gateway_title = wpinv_get_gateway_checkout_label( $gateway );
+    $gateway_title = wpinv_get_gateway_checkout_label($gateway);
     
-    if ( $gateway == $gateway_title ) {
-        $gateway_title = geodir_payment_method_title( $gateway );
+    if ($gateway == $gateway_title) {
+        $gateway_title = geodir_payment_method_title($gateway);
     }
     
-    return apply_filters( 'wpinv_gdp_to_wpi_gateway_title', $gateway_title, $payment_method );
+    return apply_filters('wpinv_gdp_to_wpi_gateway_title', $gateway_title, $payment_method);
 }
 
 function wpinv_print_checkout_errors() {
     global $wpi_session;
     wpinv_print_errors();
 }
-add_action( 'geodir_checkout_page_content', 'wpinv_print_checkout_errors', -10 );
+add_action('geodir_checkout_page_content', 'wpinv_print_checkout_errors', -10);
 
-function wpinv_cpt_save( $invoice_id, $update = false, $pre_status = NULL ) {
+function wpinv_cpt_save($invoice_id, $update = false, $pre_status = NULL) {
     global $wpi_nosave, $wpi_zero_tax, $wpi_gdp_inv_merge;
     
-    $invoice_info = geodir_get_invoice( $invoice_id );
+    $invoice_info = geodir_get_invoice($invoice_id);
     
-    $wpi_invoice_id  = !empty( $invoice_info->invoice_id ) ? $invoice_info->invoice_id : 0;
+    $wpi_invoice_id  = !empty($invoice_info->invoice_id) ? $invoice_info->invoice_id : 0;
     
     if (!empty($invoice_info)) {
-        $wpi_invoice = $wpi_invoice_id > 0 ? wpinv_get_invoice( $wpi_invoice_id ) : NULL;
+        $wpi_invoice = $wpi_invoice_id > 0 ? wpinv_get_invoice($wpi_invoice_id) : NULL;
         
-        if ( !empty( $wpi_invoice ) ) { // update invoice
+        if (!empty($wpi_invoice)) { // update invoice
             $save = false;
             if ($invoice_info->coupon_code !== $wpi_invoice->discount_code || (float)$invoice_info->discount < (float)$wpi_invoice->discount || (float)$invoice_info->discount > (float)$wpi_invoice->discount) {
                 $save = true;
@@ -202,16 +202,16 @@ 
             
             if ($invoice_info->paymentmethod !== $wpi_invoice->gateway) {
                 $save = true;
-                $gateway = !empty( $invoice_info->paymentmethod ) ? $invoice_info->paymentmethod : '';
-                $gateway = wpinv_gdp_to_wpi_gateway( $gateway );
-                $gateway_title = wpinv_gdp_to_wpi_gateway_title( $gateway );
-                $wpi_invoice->set('gateway', $gateway );
-                $wpi_invoice->set('gateway_title', $gateway_title );
+                $gateway = !empty($invoice_info->paymentmethod) ? $invoice_info->paymentmethod : '';
+                $gateway = wpinv_gdp_to_wpi_gateway($gateway);
+                $gateway_title = wpinv_gdp_to_wpi_gateway_title($gateway);
+                $wpi_invoice->set('gateway', $gateway);
+                $wpi_invoice->set('gateway_title', $gateway_title);
             }
             
-            if ( ( $status = wpinv_gdp_to_wpi_status( $invoice_info->status ) ) !== $wpi_invoice->status ) {
+            if (($status = wpinv_gdp_to_wpi_status($invoice_info->status)) !== $wpi_invoice->status) {
                 $save = true;
-                $wpi_invoice->set( 'status', $status );
+                $wpi_invoice->set('status', $status);
             }
             
             if ($save) {
@@ -222,16 +222,16 @@ 
             
             return $wpi_invoice;
         } else { // create invoice
-            $user_info = get_userdata( $invoice_info->user_id );
+            $user_info = get_userdata($invoice_info->user_id);
             
-            if ( !empty( $pre_status ) ) {
+            if (!empty($pre_status)) {
                 $invoice_info->status = $pre_status;
             }
-            $status = wpinv_gdp_to_wpi_status( $invoice_info->status );
+            $status = wpinv_gdp_to_wpi_status($invoice_info->status);
             
             $wpi_zero_tax = false;
             
-            if ( $wpi_gdp_inv_merge && in_array( $status, array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+            if ($wpi_gdp_inv_merge && in_array($status, array('publish', 'wpi-processing', 'wpi-renewal'))) {
                 $wpi_zero_tax = true;
             }
             
@@ -241,13 +241,13 @@ 
             $invoice_data['user_id']        = $invoice_info->user_id;
             $invoice_data['created_via']    = 'API';
             
-            if ( !empty( $invoice_info->date ) ) {
-                $invoice_data['created_date']   = $invoice_info->date;
+            if (!empty($invoice_info->date)) {
+                $invoice_data['created_date'] = $invoice_info->date;
             }
             
-            $paymentmethod = !empty( $invoice_info->paymentmethod ) ? $invoice_info->paymentmethod : '';
-            $paymentmethod = wpinv_gdp_to_wpi_gateway( $paymentmethod );
-            $payment_method_title = wpinv_gdp_to_wpi_gateway_title( $paymentmethod );
+            $paymentmethod = !empty($invoice_info->paymentmethod) ? $invoice_info->paymentmethod : '';
+            $paymentmethod = wpinv_gdp_to_wpi_gateway($paymentmethod);
+            $payment_method_title = wpinv_gdp_to_wpi_gateway_title($paymentmethod);
             
             $invoice_data['payment_details'] = array( 
                 'gateway'           => $paymentmethod, 
@@ -255,7 +255,7 @@ 
                 'currency'          => geodir_get_currency_type(),
             );
             
-            $user_address = wpinv_get_user_address( $invoice_info->user_id, false );
+            $user_address = wpinv_get_user_address($invoice_info->user_id, false);
             
             $invoice_data['user_info'] = array( 
                 'user_id'       => $invoice_info->user_id, 
@@ -278,8 +278,8 @@ 
             
             $post_item = wpinv_get_gd_package_item($invoice_info->package_id);
             
-            if ( !empty( $post_item ) ) {
-                $cart_details  = array();
+            if (!empty($post_item)) {
+                $cart_details = array();
                 $cart_details[] = array(
                     'id'            => $post_item->ID,
                     'name'          => $post_item->get_name(),
@@ -293,19 +293,19 @@ 
                     ),
                 );
                 
-                $invoice_data['cart_details']  = $cart_details;
+                $invoice_data['cart_details'] = $cart_details;
             }
 
-            $data = array( 'invoice' => $invoice_data );
+            $data = array('invoice' => $invoice_data);
 
             $wpinv_api = new WPInv_API();
-            $data = $wpinv_api->insert_invoice( $data );
+            $data = $wpinv_api->insert_invoice($data);
             
-            if ( is_wp_error( $data ) ) {
-                wpinv_error_log( 'WPInv_Invoice: ' . $data->get_error_message() );
+            if (is_wp_error($data)) {
+                wpinv_error_log('WPInv_Invoice: ' . $data->get_error_message());
             } else {
-                if ( !empty( $data ) ) {
-                    update_post_meta( $data->ID, '_wpinv_gdp_id', $invoice_id );
+                if (!empty($data)) {
+                    update_post_meta($data->ID, '_wpinv_gdp_id', $invoice_id);
                     
                     $update_data = array();
                     $update_data['tax_amount'] = $data->get_tax();
@@ -313,14 +313,14 @@ 
                     $update_data['invoice_id'] = $data->ID;
                     
                     global $wpdb;
-                    $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $invoice_id ) );
+                    $wpdb->update(INVOICE_TABLE, $update_data, array('id' => $invoice_id));
                     
                     return $data;
                 } else {
-                    if ( $update ) {
-                        wpinv_error_log( 'WPInv_Invoice: ' . __( 'Fail to update invoice.', 'invoicing' ) );
+                    if ($update) {
+                        wpinv_error_log('WPInv_Invoice: ' . __('Fail to update invoice.', 'invoicing'));
                     } else {
-                        wpinv_error_log( 'WPInv_Invoice: ' . __( 'Fail to create invoice.', 'invoicing' ) );
+                        wpinv_error_log('WPInv_Invoice: ' . __('Fail to create invoice.', 'invoicing'));
                     }
                 }
             }
@@ -331,59 +331,59 @@ 
 }
 add_action('geodir_payment_invoice_created', 'wpinv_cpt_save', 11, 3);
 
-function wpinv_cpt_update( $invoice_id ) {
-    return wpinv_cpt_save( $invoice_id, true );
+function wpinv_cpt_update($invoice_id) {
+    return wpinv_cpt_save($invoice_id, true);
 }
 add_action('geodir_payment_invoice_updated', 'wpinv_cpt_update', 11, 1);
 
-function wpinv_payment_status_changed( $invoice_id, $new_status, $old_status = 'pending', $subscription = false ) {
-    $invoice_info = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice_info ) ) {
+function wpinv_payment_status_changed($invoice_id, $new_status, $old_status = 'pending', $subscription = false) {
+    $invoice_info = geodir_get_invoice($invoice_id);
+    if (empty($invoice_info)) {
         return false;
     }
 
-    $invoice = !empty( $invoice_info->invoice_id ) ? wpinv_get_invoice( $invoice_info->invoice_id ) : NULL;
-    if ( !empty( $invoice ) ) {
+    $invoice = !empty($invoice_info->invoice_id) ? wpinv_get_invoice($invoice_info->invoice_id) : NULL;
+    if (!empty($invoice)) {
         $new_status = wpinv_gdp_to_wpi_status($new_status);
-        $invoice    = wpinv_update_payment_status( $invoice->ID, $new_status );
+        $invoice    = wpinv_update_payment_status($invoice->ID, $new_status);
     } else {
-        $invoice = wpinv_cpt_save( $invoice_id );
+        $invoice = wpinv_cpt_save($invoice_id);
     }
     
     return $invoice;
 }
-add_action( 'geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4 );
+add_action('geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4);
 
-function wpinv_transaction_details_note( $invoice_id, $html ) {
-    $invoice_info = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice_info ) ) {
+function wpinv_transaction_details_note($invoice_id, $html) {
+    $invoice_info = geodir_get_invoice($invoice_id);
+    if (empty($invoice_info)) {
         return false;
     }
 
-    $wpi_invoice_id = !empty( $invoice_info->invoice_id ) ? $invoice_info->invoice_id : NULL;
+    $wpi_invoice_id = !empty($invoice_info->invoice_id) ? $invoice_info->invoice_id : NULL;
     
-    if ( !$wpi_invoice_id ) {
-        $invoice = wpinv_cpt_save( $invoice_id, false, $old_status );
+    if (!$wpi_invoice_id) {
+        $invoice = wpinv_cpt_save($invoice_id, false, $old_status);
         
-        if ( !empty( $invoice ) ) {
+        if (!empty($invoice)) {
             $wpi_invoice_id = $invoice->ID;
         }
     }
 
-    $invoice = wpinv_get_invoice( $wpi_invoice_id );
+    $invoice = wpinv_get_invoice($wpi_invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
     
-    return $invoice->add_note( $html, true );
+    return $invoice->add_note($html, true);
 }
-add_action( 'geodir_payment_invoice_transaction_details_changed', 'wpinv_transaction_details_note', 11, 2 );
+add_action('geodir_payment_invoice_transaction_details_changed', 'wpinv_transaction_details_note', 11, 2);
 
-function wpinv_gdp_to_wpi_status( $status ) {
+function wpinv_gdp_to_wpi_status($status) {
     $inv_status = $status ? $status : 'pending';
     
-    switch ( $status ) {
+    switch ($status) {
         case 'confirmed':
             $inv_status = 'publish';
         break;
@@ -403,10 +403,10 @@ 
     return $inv_status;
 }
 
-function wpinv_wpi_to_gdp_status( $status ) {
+function wpinv_wpi_to_gdp_status($status) {
     $inv_status = $status ? $status : 'pending';
     
-    switch ( $status ) {
+    switch ($status) {
         case 'publish':
         case 'wpi-processing':
         case 'wpi-renewal':
@@ -429,72 +429,72 @@ 
     return $inv_status;
 }
 
-function wpinv_wpi_to_gdp_id( $invoice_id ) {
+function wpinv_wpi_to_gdp_id($invoice_id) {
     global $wpdb;
     
-    return $wpdb->get_var( $wpdb->prepare( "SELECT `id` FROM `" . INVOICE_TABLE . "` WHERE `invoice_id` = %d AND `invoice_id` > 0 ORDER BY id DESC LIMIT 1", array( (int)$invoice_id ) ) );
+    return $wpdb->get_var($wpdb->prepare("SELECT `id` FROM `" . INVOICE_TABLE . "` WHERE `invoice_id` = %d AND `invoice_id` > 0 ORDER BY id DESC LIMIT 1", array((int)$invoice_id)));
 }
 
-function wpinv_gdp_to_wpi_id( $invoice_id ) {
-    $invoice = geodir_get_invoice( $invoice_id );    
-    return ( empty( $invoice->invoice_id ) ? $invoice->invoice_id : false);
+function wpinv_gdp_to_wpi_id($invoice_id) {
+    $invoice = geodir_get_invoice($invoice_id);    
+    return (empty($invoice->invoice_id) ? $invoice->invoice_id : false);
 }
 
-function wpinv_to_gdp_recalculate_total( $invoice, $wpi_nosave ) {
+function wpinv_to_gdp_recalculate_total($invoice, $wpi_nosave) {
     global $wpdb;
     
-    if ( !empty( $wpi_nosave ) ) {
+    if (!empty($wpi_nosave)) {
         return;
     }
     
-    $gdp_invoice_id = wpinv_wpi_to_gdp_id( $invoice->ID );
+    $gdp_invoice_id = wpinv_wpi_to_gdp_id($invoice->ID);
     
-    if ( $gdp_invoice_id > 0 ) {
+    if ($gdp_invoice_id > 0) {
         $update_data = array();
         $update_data['tax_amount']      = $invoice->tax;
         $update_data['paied_amount']    = $invoice->total;
         $update_data['discount']        = $invoice->discount;
         $update_data['coupon_code']     = $invoice->discount_code;
         
-        $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $gdp_invoice_id ) );
+        $wpdb->update(INVOICE_TABLE, $update_data, array('id' => $gdp_invoice_id));
     }
     
     return;
 }
 //add_action( 'wpinv_invoice_recalculate_total', 'wpinv_to_gdp_recalculate_total', 10, 2 );
 
-function wpinv_gdp_to_wpi_invoice( $invoice_id ) {
-    $invoice = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice->invoice_id ) ) {
+function wpinv_gdp_to_wpi_invoice($invoice_id) {
+    $invoice = geodir_get_invoice($invoice_id);
+    if (empty($invoice->invoice_id)) {
         return false;
     }
     
-    return wpinv_get_invoice( $invoice->invoice_id );
+    return wpinv_get_invoice($invoice->invoice_id);
 }
 
-function wpinv_payment_set_coupon_code( $status, $invoice_id, $coupon_code ) {
-    $invoice = wpinv_gdp_to_wpi_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+function wpinv_payment_set_coupon_code($status, $invoice_id, $coupon_code) {
+    $invoice = wpinv_gdp_to_wpi_invoice($invoice_id);
+    if (empty($invoice)) {
         return $status;
     }
 
-    if ( $status === 1 || $status === 0 ) {
-        if ( $status === 1 ) {
-            $discount = geodir_get_discount_amount( $coupon_code, $invoice->get_subtotal() );
+    if ($status === 1 || $status === 0) {
+        if ($status === 1) {
+            $discount = geodir_get_discount_amount($coupon_code, $invoice->get_subtotal());
         } else {
             $discount = '';
             $coupon_code = '';
         }
         
-        $invoice->set( 'discount', $discount );
-        $invoice->set( 'discount_code', $coupon_code );
+        $invoice->set('discount', $discount);
+        $invoice->set('discount_code', $coupon_code);
         $invoice->save();
         $invoice->recalculate_total();
     }
     
     return $status;
 }
-add_filter( 'geodir_payment_set_coupon_code', 'wpinv_payment_set_coupon_code', 10, 3 );
+add_filter('geodir_payment_set_coupon_code', 'wpinv_payment_set_coupon_code', 10, 3);
 
 function wpinv_merge_gd_invoices() {
     if (!defined('GEODIRPAYMENT_VERSION')) {
@@ -502,157 +502,157 @@ 
     }
     ?>
     <tr>
-        <td><?php _e( 'Merge Price Packages', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager price packages to the Invoicing items.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_packages" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Price Packages', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager price packages to the Invoicing items.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_packages" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <tr>
-        <td><?php _e( 'Merge Invoices', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager invoices to the Invoicing.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_invoices" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Invoices', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager invoices to the Invoicing.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_invoices" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
 	<tr>
-        <td><?php _e( 'Fix Taxes for Merged Invoices', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Fix taxes for NON-PAID invoices which are merged before, from GeoDirectory Payment Manager invoices to Invoicing. This will recalculate taxes for non-paid merged invoices.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_fix_taxes" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Fix Taxes for Merged Invoices', 'invoicing'); ?></td>
+        <td><p><?php _e('Fix taxes for NON-PAID invoices which are merged before, from GeoDirectory Payment Manager invoices to Invoicing. This will recalculate taxes for non-paid merged invoices.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_fix_taxes" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <tr>
-        <td><?php _e( 'Merge Coupons', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager coupons to the Invoicing.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_coupons" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Coupons', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager coupons to the Invoicing.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_coupons" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <?php
 }
-add_action( 'wpinv_tools_row', 'wpinv_merge_gd_invoices', 10 );
+add_action('wpinv_tools_row', 'wpinv_merge_gd_invoices', 10);
 
 function wpinv_tool_merge_packages() {
     $packages = geodir_package_list_info();
     
     $count = 0;
     
-    if ( !empty( $packages ) ) {
+    if (!empty($packages)) {
         $success = true;
         
-        foreach ( $packages as $key => $package ) {
+        foreach ($packages as $key => $package) {
             $item = wpinv_get_item_by('custom_id', $package->pid, 'package');
-            if ( !empty( $item ) ) {
+            if (!empty($item)) {
                 continue;
             }
             
-            $merged = wpinv_merge_gd_package_to_item( $package->pid, false, $package );
+            $merged = wpinv_merge_gd_package_to_item($package->pid, false, $package);
             
-            if ( !empty( $merged ) ) {
-                wpinv_error_log( 'Package merge S : ' . $package->pid );
+            if (!empty($merged)) {
+                wpinv_error_log('Package merge S : ' . $package->pid);
                 $count++;
             } else {
-                wpinv_error_log( 'Package merge F : ' . $package->pid );
+                wpinv_error_log('Package merge F : ' . $package->pid);
             }
         }
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> price package is merged successfully.', 'Total <b>%d</b> price packages are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> price package is merged successfully.', 'Total <b>%d</b> price packages are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No price packages merged.', 'invoicing' );
+            $message = __('No price packages merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No price packages found to merge!', 'invoicing' );
+        $message = __('No price packages found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_packages', 'wpinv_tool_merge_packages' );
+add_action('wpinv_tool_merge_packages', 'wpinv_tool_merge_packages');
 
 function wpinv_tool_merge_invoices() {
     global $wpdb, $wpi_gdp_inv_merge, $wpi_tax_rates;
     
     $sql = "SELECT `gdi`.`id`, `gdi`.`date`, `gdi`.`date_updated` FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NULL ORDER BY `gdi`.`id` ASC";
 
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
     
     $count = 0;
     
-    if ( !empty( $items ) ) {
+    if (!empty($items)) {
         $success = true;
         $wpi_gdp_inv_merge = true;
         
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
             $wpi_tax_rates = NULL;
             
-            $wpdb->query( "UPDATE `" . INVOICE_TABLE . "` SET `invoice_id` = 0 WHERE id = '" . $item->id . "'" );
+            $wpdb->query("UPDATE `" . INVOICE_TABLE . "` SET `invoice_id` = 0 WHERE id = '" . $item->id . "'");
             
-            $merged = wpinv_cpt_save( $item->id );
+            $merged = wpinv_cpt_save($item->id);
             
-            if ( !empty( $merged ) && !empty( $merged->ID ) ) {
+            if (!empty($merged) && !empty($merged->ID)) {
                 $count++;
                 
-                $post_date = !empty( $item->date ) && $item->date != '0000-00-00 00:00:00' ? $item->date : current_time( 'mysql' );
-                $post_date_gmt = get_gmt_from_date( $post_date );
-                $post_modified = !empty( $item->date_updated ) && $item->date_updated != '0000-00-00 00:00:00' ? $item->date_updated : $post_date;
-                $post_modified_gmt = get_gmt_from_date( $post_modified );
+                $post_date = !empty($item->date) && $item->date != '0000-00-00 00:00:00' ? $item->date : current_time('mysql');
+                $post_date_gmt = get_gmt_from_date($post_date);
+                $post_modified = !empty($item->date_updated) && $item->date_updated != '0000-00-00 00:00:00' ? $item->date_updated : $post_date;
+                $post_modified_gmt = get_gmt_from_date($post_modified);
                 
-                $wpdb->update( $wpdb->posts, array( 'post_date' => $post_date, 'post_date_gmt' => $post_date_gmt, 'post_modified' => $post_modified, 'post_modified_gmt' => $post_modified_gmt ), array( 'ID' => $merged->ID ) );
+                $wpdb->update($wpdb->posts, array('post_date' => $post_date, 'post_date_gmt' => $post_date_gmt, 'post_modified' => $post_modified, 'post_modified_gmt' => $post_modified_gmt), array('ID' => $merged->ID));
                 
-                if ( $merged->is_paid() ) {
-                    update_post_meta( $merged->ID, '_wpinv_completed_date', $post_modified );
+                if ($merged->is_paid()) {
+                    update_post_meta($merged->ID, '_wpinv_completed_date', $post_modified);
                 }
                 
-                clean_post_cache( $merged->ID );
+                clean_post_cache($merged->ID);
                 
-                wpinv_error_log( 'Invoice merge S : ' . $item->id . ' => ' . $merged->ID );
+                wpinv_error_log('Invoice merge S : ' . $item->id . ' => ' . $merged->ID);
             } else {
-                wpinv_error_log( 'Invoice merge F : ' . $item->id );
+                wpinv_error_log('Invoice merge F : ' . $item->id);
             }
         }
         
         $wpi_gdp_inv_merge = false;
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> invoice is merged successfully.', 'Total <b>%d</b> invoices are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> invoice is merged successfully.', 'Total <b>%d</b> invoices are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No invoices merged.', 'invoicing' );
+            $message = __('No invoices merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No invoices found to merge!', 'invoicing' );
+        $message = __('No invoices found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_invoices', 'wpinv_tool_merge_invoices' );
+add_action('wpinv_tool_merge_invoices', 'wpinv_tool_merge_invoices');
 
 function wpinv_tool_merge_coupons() {
     global $wpdb;
     
     $sql = "SELECT * FROM `" . COUPON_TABLE . "` WHERE `coupon_code` IS NOT NULL AND `coupon_code` != '' ORDER BY `cid` ASC";
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
     $count = 0;
     
-    if ( !empty( $items ) ) {
+    if (!empty($items)) {
         $success = true;
         
-        foreach ( $items as $item ) {
-            if ( wpinv_get_discount_by_code( $item->coupon_code ) ) {
+        foreach ($items as $item) {
+            if (wpinv_get_discount_by_code($item->coupon_code)) {
                 continue;
             }
             
             $args = array(
                 'post_type'   => 'wpi_discount',
                 'post_title'  => $item->coupon_code,
-                'post_status' => !empty( $item->status ) ? 'publish' : 'pending'
+                'post_status' => !empty($item->status) ? 'publish' : 'pending'
             );
 
-            $merged = wp_insert_post( $args );
+            $merged = wp_insert_post($args);
             
             $item_id = $item->cid;
             
-            if ( $merged ) {
+            if ($merged) {
                 $meta = array(
                     'code'              => $item->coupon_code,
                     'type'              => $item->discount_type != 'per' ? 'flat' : 'percent',
@@ -660,65 +660,65 @@ 
                     'max_uses'          => (int)$item->usage_limit,
                     'uses'              => (int)$item->usage_count,
                 );
-                wpinv_store_discount( $merged, $meta, get_post( $merged ) );
+                wpinv_store_discount($merged, $meta, get_post($merged));
                 
                 $count++;
                 
-                wpinv_error_log( 'Coupon merge S : ' . $item_id . ' => ' . $merged );
+                wpinv_error_log('Coupon merge S : ' . $item_id . ' => ' . $merged);
             } else {
-                wpinv_error_log( 'Coupon merge F : ' . $item_id );
+                wpinv_error_log('Coupon merge F : ' . $item_id);
             }
         }
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> coupon is merged successfully.', 'Total <b>%d</b> coupons are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> coupon is merged successfully.', 'Total <b>%d</b> coupons are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No coupons merged.', 'invoicing' );
+            $message = __('No coupons merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No coupons found to merge!', 'invoicing' );
+        $message = __('No coupons found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_coupons', 'wpinv_tool_merge_coupons' );
+add_action('wpinv_tool_merge_coupons', 'wpinv_tool_merge_coupons');
 
-function wpinv_gdp_to_wpi_currency( $value, $option = '' ) {
+function wpinv_gdp_to_wpi_currency($value, $option = '') {
     return wpinv_get_currency();
 }
-add_filter( 'pre_option_geodir_currency', 'wpinv_gdp_to_wpi_currency', 10, 2 );
+add_filter('pre_option_geodir_currency', 'wpinv_gdp_to_wpi_currency', 10, 2);
 
-function wpinv_gdp_to_wpi_currency_sign( $value, $option = '' ) {
+function wpinv_gdp_to_wpi_currency_sign($value, $option = '') {
     return wpinv_currency_symbol();
 }
-add_filter( 'pre_option_geodir_currencysym', 'wpinv_gdp_to_wpi_currency_sign', 10, 2 );
+add_filter('pre_option_geodir_currencysym', 'wpinv_gdp_to_wpi_currency_sign', 10, 2);
 
-function wpinv_gdp_to_wpi_display_price( $price, $amount, $display = true , $decimal_sep, $thousand_sep ) {
-    if ( !$display ) {
-        $price = wpinv_round_amount( $amount );
+function wpinv_gdp_to_wpi_display_price($price, $amount, $display = true, $decimal_sep, $thousand_sep) {
+    if (!$display) {
+        $price = wpinv_round_amount($amount);
     } else {
-        $price = wpinv_price( wpinv_format_amount( $amount ) );
+        $price = wpinv_price(wpinv_format_amount($amount));
     }
     
     return $price;
 }
-add_filter( 'geodir_payment_price' , 'wpinv_gdp_to_wpi_display_price', 10000, 5 );
+add_filter('geodir_payment_price', 'wpinv_gdp_to_wpi_display_price', 10000, 5);
 
-function wpinv_gdp_to_inv_checkout_redirect( $redirect_url ) {
+function wpinv_gdp_to_inv_checkout_redirect($redirect_url) {
     $invoice_id         = geodir_payment_cart_id();
-    $invoice_info       = geodir_get_invoice( $invoice_id );
-    $wpi_invoice        = !empty( $invoice_info->invoice_id ) ? wpinv_get_invoice( $invoice_info->invoice_id ) : NULL;
+    $invoice_info       = geodir_get_invoice($invoice_id);
+    $wpi_invoice        = !empty($invoice_info->invoice_id) ? wpinv_get_invoice($invoice_info->invoice_id) : NULL;
     
-    if ( !( !empty( $wpi_invoice ) && !empty( $wpi_invoice->ID ) ) ) {
-        $wpi_invoice_id = wpinv_cpt_save( $invoice_id );
-        $wpi_invoice    = wpinv_get_invoice( $wpi_invoice_id );
+    if (!(!empty($wpi_invoice) && !empty($wpi_invoice->ID))) {
+        $wpi_invoice_id = wpinv_cpt_save($invoice_id);
+        $wpi_invoice    = wpinv_get_invoice($wpi_invoice_id);
     }
     
-    if ( !empty( $wpi_invoice ) && !empty( $wpi_invoice->ID ) ) {
+    if (!empty($wpi_invoice) && !empty($wpi_invoice->ID)) {
         
         // Clear cart
         geodir_payment_clear_cart();
@@ -728,121 +728,121 @@ 
     
     return $redirect_url;
 }
-add_filter( 'geodir_payment_checkout_redirect_url', 'wpinv_gdp_to_inv_checkout_redirect', 100, 1 );
+add_filter('geodir_payment_checkout_redirect_url', 'wpinv_gdp_to_inv_checkout_redirect', 100, 1);
 
-function wpinv_gdp_dashboard_invoice_history_link( $dashboard_links ) {    
-    if ( get_current_user_id() ) {        
-        $dashboard_links .= '<li><i class="fa fa-shopping-cart"></i><a class="gd-invoice-link" href="' . esc_url( wpinv_get_history_page_uri() ) . '">' . __( 'My Invoice History', 'invoicing' ) . '</a></li>';
+function wpinv_gdp_dashboard_invoice_history_link($dashboard_links) {    
+    if (get_current_user_id()) {        
+        $dashboard_links .= '<li><i class="fa fa-shopping-cart"></i><a class="gd-invoice-link" href="' . esc_url(wpinv_get_history_page_uri()) . '">' . __('My Invoice History', 'invoicing') . '</a></li>';
     }
 
     return $dashboard_links;
 }
-add_action( 'geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link' );
-remove_action( 'geodir_dashboard_links', 'geodir_payment_invoices_list_page_link' );
+add_action('geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link');
+remove_action('geodir_dashboard_links', 'geodir_payment_invoices_list_page_link');
 
-function wpinv_wpi_to_gdp_update_status( $invoice_id, $new_status, $old_status ) {
+function wpinv_wpi_to_gdp_update_status($invoice_id, $new_status, $old_status) {
     if (!defined('GEODIRPAYMENT_VERSION')) {
         return false;
     }
     
-    $invoice    = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    remove_action( 'geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4 );
+    remove_action('geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4);
     
-    $invoice_id = wpinv_wpi_to_gdp_id( $invoice_id );
-    $new_status = wpinv_wpi_to_gdp_status( $new_status );
+    $invoice_id = wpinv_wpi_to_gdp_id($invoice_id);
+    $new_status = wpinv_wpi_to_gdp_status($new_status);
     
-    geodir_update_invoice_status( $invoice_id, $new_status, $invoice->is_recurring() );
+    geodir_update_invoice_status($invoice_id, $new_status, $invoice->is_recurring());
 }
-add_action( 'wpinv_update_status', 'wpinv_wpi_to_gdp_update_status', 999, 3 );
+add_action('wpinv_update_status', 'wpinv_wpi_to_gdp_update_status', 999, 3);
 
-function wpinv_gdp_to_wpi_delete_package( $gd_package_id ) {
-    $item = wpinv_get_item_by( 'custom_id', $gd_package_id, 'package' );
+function wpinv_gdp_to_wpi_delete_package($gd_package_id) {
+    $item = wpinv_get_item_by('custom_id', $gd_package_id, 'package');
     
-    if ( !empty( $item ) ) {
-        wpinv_remove_item( $item, true );
+    if (!empty($item)) {
+        wpinv_remove_item($item, true);
     }
 }
-add_action( 'geodir_payment_post_delete_package', 'wpinv_gdp_to_wpi_delete_package', 10, 1 ) ;
+add_action('geodir_payment_post_delete_package', 'wpinv_gdp_to_wpi_delete_package', 10, 1);
 
-function wpinv_can_delete_package_item( $return, $post_id ) {
-    if ( $return && function_exists( 'geodir_get_package_info_by_id' ) && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' && $package_id = get_post_meta( $post_id, '_wpinv_custom_id', true ) ) {
-        $gd_package = geodir_get_package_info_by_id( $package_id, '' );
+function wpinv_can_delete_package_item($return, $post_id) {
+    if ($return && function_exists('geodir_get_package_info_by_id') && get_post_meta($post_id, '_wpinv_type', true) == 'package' && $package_id = get_post_meta($post_id, '_wpinv_custom_id', true)) {
+        $gd_package = geodir_get_package_info_by_id($package_id, '');
         
-        if ( !empty( $gd_package ) ) {
+        if (!empty($gd_package)) {
             $return = false;
         }
     }
 
     return $return;
 }
-add_filter( 'wpinv_can_delete_item', 'wpinv_can_delete_package_item', 10, 2 );
+add_filter('wpinv_can_delete_item', 'wpinv_can_delete_package_item', 10, 2);
 
-function wpinv_package_item_classes( $classes, $class, $post_id ) {
+function wpinv_package_item_classes($classes, $class, $post_id) {
     global $typenow;
 
-    if ( $typenow == 'wpi_item' && in_array( 'wpi-gd-package', $classes ) ) {
-        if ( wpinv_item_in_use( $post_id ) ) {
+    if ($typenow == 'wpi_item' && in_array('wpi-gd-package', $classes)) {
+        if (wpinv_item_in_use($post_id)) {
             $classes[] = 'wpi-inuse-pkg';
-        } else if ( !( function_exists( 'geodir_get_package_info_by_id' ) && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' && geodir_get_package_info_by_id( (int)get_post_meta( $post_id, '_wpinv_custom_id', true ), '' ) ) ) {
+        } else if (!(function_exists('geodir_get_package_info_by_id') && get_post_meta($post_id, '_wpinv_type', true) == 'package' && geodir_get_package_info_by_id((int)get_post_meta($post_id, '_wpinv_custom_id', true), ''))) {
             $classes[] = 'wpi-delete-pkg';
         }
     }
 
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_package_item_classes', 10, 3 );
+add_filter('post_class', 'wpinv_package_item_classes', 10, 3);
 
-function wpinv_gdp_package_type_info( $post ) {
-    if ( wpinv_pm_active() ) {
-        ?><p class="wpi-m0"><?php _e( 'Package: GeoDirectory price packages items.', 'invoicing' );?></p>
+function wpinv_gdp_package_type_info($post) {
+    if (wpinv_pm_active()) {
+        ?><p class="wpi-m0"><?php _e('Package: GeoDirectory price packages items.', 'invoicing'); ?></p>
         <?php
     }
 }
-add_action( 'wpinv_item_info_metabox_after', 'wpinv_gdp_package_type_info', 10, 1 ) ;
+add_action('wpinv_item_info_metabox_after', 'wpinv_gdp_package_type_info', 10, 1);
 
-function wpinv_gdp_to_gdi_set_zero_tax( $is_taxable, $item_id, $country , $state ) {
+function wpinv_gdp_to_gdi_set_zero_tax($is_taxable, $item_id, $country, $state) {
     global $wpi_zero_tax;
 
-    if ( $wpi_zero_tax ) {
+    if ($wpi_zero_tax) {
         $is_taxable = false;
     }
 
     return $is_taxable;
 }
-add_action( 'wpinv_item_is_taxable', 'wpinv_gdp_to_gdi_set_zero_tax', 10, 4 ) ;
+add_action('wpinv_item_is_taxable', 'wpinv_gdp_to_gdi_set_zero_tax', 10, 4);
 
 function wpinv_tool_merge_fix_taxes() {
     global $wpdb;
     
 	$sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
-	$items = $wpdb->get_results( $sql );
+	$items = $wpdb->get_results($sql);
 	
-	if ( !empty( $items ) ) {
-		foreach ( $items as $item ) {
-			if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
-				update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
+	if (!empty($items)) {
+		foreach ($items as $item) {
+			if (get_post_meta($item->ID, '_wpinv_vat_class', true) == '_exempt') {
+				update_post_meta($item->ID, '_wpinv_vat_class', '_standard');
 			}
 		}
 	}
 		
     $sql = "SELECT `p`.`ID`, gdi.id AS gdp_id FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NOT NULL AND p.post_status NOT IN( 'publish', 'wpi-processing', 'wpi-renewal' ) ORDER BY `gdi`.`id` ASC";
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
 	
-	if ( !empty( $items ) ) {
+	if (!empty($items)) {
 		$success = false;
-        $message = __( 'Taxes fixed for non-paid merged GD invoices.', 'invoicing' );
+        $message = __('Taxes fixed for non-paid merged GD invoices.', 'invoicing');
 		
 		global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
 		
-		foreach ( $items as $item ) {
+		foreach ($items as $item) {
 			$wpi_tax_rates = NULL;               
 			$data = wpinv_get_invoice($item->ID);
 
-			if ( empty( $data ) ) {
+			if (empty($data)) {
 				continue;
 			}
 			
@@ -850,51 +850,51 @@ 
 			
 			$data_session                   = array();
 			$data_session['invoice_id']     = $data->ID;
-			$data_session['cart_discounts'] = $data->get_discounts( true );
+			$data_session['cart_discounts'] = $data->get_discounts(true);
 			
-			wpinv_set_checkout_session( $data_session );
+			wpinv_set_checkout_session($data_session);
 			
 			$wpi_userID         = (int)$data->get_user_id();
 			$_POST['country']   = !empty($data->country) ? $data->country : wpinv_get_default_country();
 				
-			$data->country      = sanitize_text_field( $_POST['country'] );
-			$data->set( 'country', sanitize_text_field( $_POST['country'] ) );
+			$data->country      = sanitize_text_field($_POST['country']);
+			$data->set('country', sanitize_text_field($_POST['country']));
 			
 			$wpinv_ip_address_country = $data->country;
 			
 			$data->recalculate_totals(true);
 			
-			wpinv_set_checkout_session( $checkout_session );
+			wpinv_set_checkout_session($checkout_session);
 			
 			$update_data = array();
 			$update_data['tax_amount'] = $data->get_tax();
 			$update_data['paied_amount'] = $data->get_total();
 			$update_data['invoice_id'] = $data->ID;
 			
-			$wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
+			$wpdb->update(INVOICE_TABLE, $update_data, array('id' => $item->gdp_id));
 		}
 	} else {
         $success = false;
-        $message = __( 'No invoices found to fix taxes!', 'invoicing' );
+        $message = __('No invoices found to fix taxes!', 'invoicing');
     }
 	
 	$response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_fix_taxes', 'wpinv_tool_merge_fix_taxes' );
-remove_action( 'geodir_before_detail_fields' , 'geodir_build_coupon', 2 );
+add_action('wpinv_tool_merge_fix_taxes', 'wpinv_tool_merge_fix_taxes');
+remove_action('geodir_before_detail_fields', 'geodir_build_coupon', 2);
 
-function wpinv_wpi_to_gdp_handle_subscription_cancel( $invoice_id, $invoice ) {
-    if ( wpinv_pm_active() && !empty( $invoice ) && $invoice->is_recurring() ) {
-        if ( $invoice->is_renewal() ) {
+function wpinv_wpi_to_gdp_handle_subscription_cancel($invoice_id, $invoice) {
+    if (wpinv_pm_active() && !empty($invoice) && $invoice->is_recurring()) {
+        if ($invoice->is_renewal()) {
             $invoice = $invoice->get_parent_payment();
         }
         
-        if ( !empty( $invoice ) ) {
-            wpinv_wpi_to_gdp_update_status( $invoice->ID, 'wpi-cancelled', $invoice->get_status() );
+        if (!empty($invoice)) {
+            wpinv_wpi_to_gdp_update_status($invoice->ID, 'wpi-cancelled', $invoice->get_status());
         }
     }
 }
-add_action( 'wpinv_subscription_cancelled', 'wpinv_wpi_to_gdp_handle_subscription_cancel', 10, 2 );
\ No newline at end of file
+add_action('wpinv_subscription_cancelled', 'wpinv_wpi_to_gdp_handle_subscription_cancel', 10, 2);
\ No newline at end of file

includes/class-wpinv-notes.php

Spacing +39 added lines, -39 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,73 +14,73 @@ 
     }
     
     public function init() {
-        do_action( 'wpinv_class_notes_init', $this );
+        do_action('wpinv_class_notes_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_notes_includes', $this );
+        do_action('wpinv_class_notes_includes', $this);
     }
     
     public function actions() {
         // Secure inovice notes
-        add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
+        add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
         
         // Count comments
-        add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 11, 2 );
+        add_filter('wp_count_comments', array($this, 'wp_count_comments'), 11, 2);
         
         // Delete comments count cache whenever there is a new comment or a comment status changes
-        add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
-        add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
+        add_action('wp_insert_comment', array($this, 'delete_comments_count_cache'));
+        add_action('wp_set_comment_status', array($this, 'delete_comments_count_cache'));
         
-        do_action( 'wpinv_class_notes_actions', $this );
+        do_action('wpinv_class_notes_actions', $this);
     }
         
-    public function set_invoice_note_type( $query ) {
-        $post_ID        = !empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+    public function set_invoice_note_type($query) {
+        $post_ID = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
         
-        if ( $post_ID && get_post_type( $post_ID ) == $this->invoice_post_type ) {
+        if ($post_ID && get_post_type($post_ID) == $this->invoice_post_type) {
             $query->query_vars['type__in']      = $this->comment_type;
             $query->query_vars['type__not_in']  = '';
         } else {        
-            if ( isset( $query->query_vars['type__in'] ) && $type_in = $query->query_vars['type__in'] ) {
-                if ( is_array( $type_in ) && in_array( $this->comment_type, $type_in ) ) {
-                    $key = array_search( $this->comment_type, $type_in );
-                    unset( $query->query_vars['type__in'][$key] );
-                } else if ( !is_array( $type_in ) && $type_in == $this->comment_type ) {
+            if (isset($query->query_vars['type__in']) && $type_in = $query->query_vars['type__in']) {
+                if (is_array($type_in) && in_array($this->comment_type, $type_in)) {
+                    $key = array_search($this->comment_type, $type_in);
+                    unset($query->query_vars['type__in'][$key]);
+                } else if (!is_array($type_in) && $type_in == $this->comment_type) {
                     $query->query_vars['type__in'] = '';
                 }
             }
             
-            if ( isset( $query->query_vars['type__not_in'] ) && $type_not_in = $query->query_vars['type__not_in'] ) {
-                if ( is_array( $type_not_in ) && !in_array( $this->comment_type, $type_not_in ) ) {
+            if (isset($query->query_vars['type__not_in']) && $type_not_in = $query->query_vars['type__not_in']) {
+                if (is_array($type_not_in) && !in_array($this->comment_type, $type_not_in)) {
                     $query->query_vars['type__not_in'][] = $this->comment_type;
-                } else if ( !is_array( $type_not_in ) && $type_not_in != $this->comment_type ) {
+                } else if (!is_array($type_not_in) && $type_not_in != $this->comment_type) {
                     $query->query_vars['type__not_in'] = (array)$query->query_vars['type__not_in'];
                     $query->query_vars['type__not_in'][] = $this->comment_type;
                 }
             } else {
-                $query->query_vars['type__not_in']  = $this->comment_type;
+                $query->query_vars['type__not_in'] = $this->comment_type;
             }
         }
         
         return $query;
     }
     
-    public function get_invoice_notes( $invoice_id = 0, $type = '' ) {
+    public function get_invoice_notes($invoice_id = 0, $type = '') {
         $args = array( 
             'post_id'   => $invoice_id,
             'orderby'   => 'comment_ID',
             'order'     => 'DESC',
         );
         
-        if ( $type == 'customer' ) {
+        if ($type == 'customer') {
             $args['meta_key']   = '_wpi_customer_note';
             $args['meta_value'] = 1;
         }
         
-        $args   = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+        $args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
         
-        return get_comments( $args );
+        return get_comments($args);
     }
     
     /**
@@ -91,7 +91,7 @@ 
      * @return void
      */
     public function delete_comments_count_cache() {
-        delete_transient( 'wpinv_count_comments' );
+        delete_transient('wpinv_count_comments');
     }
     
     /**
@@ -102,16 +102,16 @@ 
      * @param  int    $post_id Post ID.
      * @return object
      */
-    public function wp_count_comments( $stats, $post_id ) {
+    public function wp_count_comments($stats, $post_id) {
         global $wpdb;
 
-        if ( 0 === $post_id ) {
-            $stats = get_transient( 'wpinv_count_comments' );
+        if (0 === $post_id) {
+            $stats = get_transient('wpinv_count_comments');
 
-            if ( ! $stats ) {
+            if (!$stats) {
                 $stats = array();
 
-                $count = $wpdb->get_results( "SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A );
+                $count = $wpdb->get_results("SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A);
 
                 $total = 0;
                 $approved = array(
@@ -122,26 +122,26 @@ 
                     'post-trashed' => 'post-trashed',
                 );
 
-                foreach ( (array) $count as $row ) {
+                foreach ((array)$count as $row) {
                     // Do not count post-trashed toward totals.
-                    if ( 'post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved'] ) {
+                    if ('post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved']) {
                         $total += $row['num_comments'];
                     }
-                    if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-                        $stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+                    if (isset($approved[$row['comment_approved']])) {
+                        $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
                     }
                 }
 
                 $stats['total_comments'] = $total;
                 $stats['all'] = $total;
-                foreach ( $approved as $key ) {
-                    if ( empty( $stats[ $key ] ) ) {
-                        $stats[ $key ] = 0;
+                foreach ($approved as $key) {
+                    if (empty($stats[$key])) {
+                        $stats[$key] = 0;
                     }
                 }
 
-                $stats = (object) $stats;
-                set_transient( 'wpinv_count_comments', $stats );
+                $stats = (object)$stats;
+                set_transient('wpinv_count_comments', $stats);
             }
         }
 

includes/admin/wpinv-upgrade-functions.php

Spacing +13 added lines, -13 removed lines

@@ -11,37 +11,37 @@
  * @since 1.0.0
 */
 function wpinv_automatic_upgrade() {
-    $wpi_version = get_option( 'wpinv_version' );
+    $wpi_version = get_option('wpinv_version');
     
-    if ( $wpi_version == WPINV_VERSION ) {
+    if ($wpi_version == WPINV_VERSION) {
         return;
     }
     
-    if ( version_compare( $wpi_version, '0.0.5', '<' ) ) {
+    if (version_compare($wpi_version, '0.0.5', '<')) {
         wpinv_v005_upgrades();
     }
     
-    update_option( 'wpinv_version', WPINV_VERSION );
+    update_option('wpinv_version', WPINV_VERSION);
 }
-add_action( 'admin_init', 'wpinv_automatic_upgrade' );
+add_action('admin_init', 'wpinv_automatic_upgrade');
 
 function wpinv_v005_upgrades() {
     global $wpdb;
     
     // Invoices status
-    $wpdb->query( "UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+    $wpdb->query("UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
     
     // Item meta key changes
     $query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-    $results = $wpdb->get_results( $query );
+    $results = $wpdb->get_results($query);
     
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
         
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->post_id );
+        foreach ($results as $row) {
+            clean_post_cache($row->post_id);
         }
     }
 }
\ No newline at end of file