AyeCode / invoicing

templates/invoice/line-item.php

Spacing +27 added lines, -27 removed lines

@@ -10,55 +10,55 @@ 
  * @var array $columns
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_before_invoice_line_item', $invoice, $item );
+do_action('getpaid_before_invoice_line_item', $invoice, $item);
 
 ?>
 
-<div class='getpaid-invoice-item item-<?php echo (int) $item->get_id(); ?> item-type-<?php echo sanitize_html_class( $item->get_type() ); ?> border-bottom'>
+<div class='getpaid-invoice-item item-<?php echo (int) $item->get_id(); ?> item-type-<?php echo sanitize_html_class($item->get_type()); ?> border-bottom'>
 
     <div class="form-row">
 
-        <?php foreach ( array_keys( $columns ) as $column ): ?>
+        <?php foreach (array_keys($columns) as $column): ?>
 
-            <div class="<?php echo 'name' == $column ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-invoice-item-<?php echo sanitize_html_class( $column ); ?>">
+            <div class="<?php echo 'name' == $column ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-invoice-item-<?php echo sanitize_html_class($column); ?>">
 
                 <?php
 
                     // Fires before printing a line item column.
-                    do_action( "getpaid_invoice_line_item_before_$column", $item, $invoice );
+                    do_action("getpaid_invoice_line_item_before_$column", $item, $invoice);
 
                     // Item name.
-                    if ( 'name' == $column ) {
+                    if ('name' == $column) {
 
                         // Display the name.
-                        echo '<div class="mb-1">' . esc_html( $item->get_name() ) . '</div>';
+                        echo '<div class="mb-1">' . esc_html($item->get_name()) . '</div>';
 
                         // And an optional description.
                         $description = $item->get_description();
 
-                        if ( ! empty( $description ) ) {
-                            $description = wp_kses_post( $description );
+                        if (!empty($description)) {
+                            $description = wp_kses_post($description);
                             echo "<small class='form-text text-muted pr-2 m-0'>$description</small>";
                         }
 
                         // Fires before printing the line item actions.
-                        do_action( "getpaid_before_invoice_line_item_actions", $item, $invoice );
+                        do_action("getpaid_before_invoice_line_item_actions", $item, $invoice);
 
-                        $actions = apply_filters( 'getpaid-invoice-page-line-item-actions', array(), $item, $invoice );
+                        $actions = apply_filters('getpaid-invoice-page-line-item-actions', array(), $item, $invoice);
 
-                        if ( ! empty( $actions ) ) {
+                        if (!empty($actions)) {
 
-                            $sanitized  = array();
-                            foreach ( $actions as $key => $action ) {
-                                $key         = sanitize_html_class( $key );
-                                $action      = wp_kses_post( $action );
+                            $sanitized = array();
+                            foreach ($actions as $key => $action) {
+                                $key         = sanitize_html_class($key);
+                                $action      = wp_kses_post($action);
                                 $sanitized[] = "<span class='$key'>$action</span>";
                             }
 
                             echo "<small class='form-text getpaid-line-item-actions'>";
-                            echo implode( ' | ', $sanitized );
+                            echo implode(' | ', $sanitized);
                             echo '</small>';
 
                         }
@@ -66,35 +66,35 @@ 
                     }
 
                     // Item price.
-                    if ( 'price' == $column ) {
+                    if ('price' == $column) {
 
                         // Display the item price (or recurring price if this is a renewal invoice)
                         $price = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
-                        echo wpinv_price( $price, $invoice->get_currency() );
+                        echo wpinv_price($price, $invoice->get_currency());
 
                     }
 
                     // Tax rate.
-                    if ( 'tax_rate' == $column ) {
-                        echo round( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) . '%';
+                    if ('tax_rate' == $column) {
+                        echo round(getpaid_get_invoice_tax_rate($invoice, $item), 2) . '%';
                     }
 
                     // Item quantity.
-                    if ( 'quantity' == $column ) {
+                    if ('quantity' == $column) {
                         echo (float) $item->get_quantity();
                     }
 
                     // Item sub total.
-                    if ( 'subtotal' == $column ) {
+                    if ('subtotal' == $column) {
                         $subtotal = $invoice->is_renewal() ? $item->get_recurring_sub_total() : $item->get_sub_total();
-                        echo wpinv_price( $subtotal, $invoice->get_currency() );
+                        echo wpinv_price($subtotal, $invoice->get_currency());
                     }
 
                     // Fires when printing a line item column.
-                    do_action( "getpaid_invoice_line_item_$column", $item, $invoice );
+                    do_action("getpaid_invoice_line_item_$column", $item, $invoice);
 
                     // Fires after printing a line item column.
-                    do_action( "getpaid_invoice_line_item_after_$column", $item, $invoice );
+                    do_action("getpaid_invoice_line_item_after_$column", $item, $invoice);
 
                 ?>
 

templates/invoice/billing-address.php

Spacing +15 added lines, -15 removed lines

@@ -7,10 +7,10 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$invoice     = new WPInv_Invoice( $invoice );
-$address_row = wpinv_get_invoice_address_markup( $invoice->get_user_info() );
+$invoice     = new WPInv_Invoice($invoice);
+$address_row = wpinv_get_invoice_address_markup($invoice->get_user_info());
 $phone       = $invoice->get_phone();
 $email       = $invoice->get_email();
 $vat_number  = $invoice->get_vat_number();
@@ -22,47 +22,47 @@ 
 
 
             <div class="invoice-billing-address-label col-2">
-                <strong><?php _e( 'To:', 'invoicing' ) ?></strong>
+                <strong><?php _e('To:', 'invoicing') ?></strong>
             </div>
 
 
             <div class="invoice-billing-address-value col-10">
 
-                <?php do_action( 'getpaid_billing_address_top' ); ?>
+                <?php do_action('getpaid_billing_address_top'); ?>
 
-                <?php if ( ! empty( $address_row ) ) : ?>
+                <?php if (!empty($address_row)) : ?>
                     <div class="billing-address">
                         <?php echo $address_row; ?>
                     </div>
                 <?php endif; ?>
 
 
-                <?php if ( ! empty( $phone ) ) : ?>
+                <?php if (!empty($phone)) : ?>
                     <div class="billing-phone">
-                        <?php echo wp_sprintf( __( 'Phone: %s', 'invoicing' ), esc_html( $phone ) ); ?>
+                        <?php echo wp_sprintf(__('Phone: %s', 'invoicing'), esc_html($phone)); ?>
                     </div>
                 <?php endif; ?>
 
 
-                <?php if ( ! empty( $email ) ) : ?>
+                <?php if (!empty($email)) : ?>
                     <div class="billing-email">
-                        <?php echo wp_sprintf( __( 'Email: %s', 'invoicing' ), sanitize_email( $email ) ); ?>
+                        <?php echo wp_sprintf(__('Email: %s', 'invoicing'), sanitize_email($email)); ?>
                     </div>
                 <?php endif; ?>
 
-                <?php if ( ! empty( $vat_number ) ) : ?>
+                <?php if (!empty($vat_number)) : ?>
                     <div class="vat-number">
-                        <?php echo wp_sprintf( __( 'Vat Number: %s', 'invoicing' ), esc_html( $vat_number ) ); ?>
+                        <?php echo wp_sprintf(__('Vat Number: %s', 'invoicing'), esc_html($vat_number)); ?>
                     </div>
                 <?php endif; ?>
 
-                <?php if ( ! empty( $company_id ) ) : ?>
+                <?php if (!empty($company_id)) : ?>
                     <div class="company-id">
-                        <?php echo wp_sprintf( __( 'Company ID: %s', 'invoicing' ), esc_html( $company_id ) ); ?>
+                        <?php echo wp_sprintf(__('Company ID: %s', 'invoicing'), esc_html($company_id)); ?>
                     </div>
                 <?php endif; ?>
 
-                <?php do_action( 'getpaid_billing_address_bottom' ); ?>
+                <?php do_action('getpaid_billing_address_bottom'); ?>
 
             </div>
 

templates/invoice/line-items.php

Spacing +13 added lines, -13 removed lines

@@ -8,21 +8,21 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
-<?php do_action( 'getpaid_invoice_before_line_items', $invoice ); ?>
+<?php do_action('getpaid_invoice_before_line_items', $invoice); ?>
 
-    <h2 class="mt-5 mb-1 h4"><?php echo sprintf( esc_html__( '%s Items', 'invoicing' ), ucfirst( $invoice->get_invoice_quote_type() )); ?></h2>
+    <h2 class="mt-5 mb-1 h4"><?php echo sprintf(esc_html__('%s Items', 'invoicing'), ucfirst($invoice->get_invoice_quote_type())); ?></h2>
     <div class="getpaid-invoice-items mb-4 border">
 
 
-        <div class="getpaid-invoice-items-header <?php echo sanitize_html_class( $invoice->get_template() ); ?>">
+        <div class="getpaid-invoice-items-header <?php echo sanitize_html_class($invoice->get_template()); ?>">
             <div class="form-row">
-                <?php foreach ( $columns as $key => $label ) : ?>
-                    <div class="<?php echo 'name' == $key ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-invoice-line-item-col-<?php echo esc_attr( $key ); ?>">
-                        <?php echo esc_html( $label ); ?>
+                <?php foreach ($columns as $key => $label) : ?>
+                    <div class="<?php echo 'name' == $key ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-invoice-line-item-col-<?php echo esc_attr($key); ?>">
+                        <?php echo esc_html($label); ?>
                     </div>
                 <?php endforeach; ?>
             </div>
@@ -32,20 +32,20 @@ 
         <?php
 
             // Display the item totals.
-            foreach ( $invoice->get_items() as $item ) {
-                wpinv_get_template( 'invoice/line-item.php', compact( 'invoice', 'item', 'columns' ) );
+            foreach ($invoice->get_items() as $item) {
+                wpinv_get_template('invoice/line-item.php', compact('invoice', 'item', 'columns'));
             }
 
             // Display the fee totals.
-            foreach ( $invoice->get_fees() as $fee ) {
-                wpinv_get_template( 'invoice/fee-item.php', compact( 'invoice', 'fee', 'columns' ) );
+            foreach ($invoice->get_fees() as $fee) {
+                wpinv_get_template('invoice/fee-item.php', compact('invoice', 'fee', 'columns'));
             }
 
             // Display the cart totals.
-            wpinv_get_template( 'invoice/line-totals.php', compact( 'invoice' ) );
+            wpinv_get_template('invoice/line-totals.php', compact('invoice'));
 
         ?>
 
     </div>
 
-<?php do_action( 'getpaid_invoice_after_line_items', $invoice ); ?>
+<?php do_action('getpaid_invoice_after_line_items', $invoice); ?>

templates/invoice/invoice-meta.php

Spacing +15 added lines, -15 removed lines

@@ -7,50 +7,50 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$class = ! is_singular( 'page' ) ? 'px-1' : '';
+$class = !is_singular('page') ? 'px-1' : '';
 ?>
 
-        <?php do_action( 'getpaid_before_invoice_meta', $invoice ); ?>
+        <?php do_action('getpaid_before_invoice_meta', $invoice); ?>
         <div class="getpaid-invoice-meta-data">
 
-            <?php do_action( 'getpaid_before_invoice_meta_table', $invoice ); ?>
+            <?php do_action('getpaid_before_invoice_meta_table', $invoice); ?>
             <table class="table table-bordered">
                 <tbody>
 
-                    <?php do_action( "getpaid_before_invoice_meta_rows", $invoice ); ?>
-                    <?php foreach ( $meta as $key => $data ) : ?>
+                    <?php do_action("getpaid_before_invoice_meta_rows", $invoice); ?>
+                    <?php foreach ($meta as $key => $data) : ?>
 
-                        <?php if ( ! empty( $data['value'] ) ) : ?>
+                        <?php if (!empty($data['value'])) : ?>
 
-                            <?php do_action( "getpaid_before_invoice_meta_$key", $invoice, $data ); ?>
+                            <?php do_action("getpaid_before_invoice_meta_$key", $invoice, $data); ?>
 
-                            <tr class="getpaid-invoice-meta-<?php echo sanitize_html_class( $key ); ?>">
+                            <tr class="getpaid-invoice-meta-<?php echo sanitize_html_class($key); ?>">
 
                                 <th class="<?php echo $class; ?> font-weight-bold" style="width: 40%">
-                                    <?php echo esc_html( $data['label'] ); ?>
+                                    <?php echo esc_html($data['label']); ?>
                                 </th>
 
                                 <td class="<?php echo $class; ?> <?php echo $key == 'invoice_total' ? 'font-weight-bold' : 'font-weight-normal'; ?> text-break" style="width: 60%">
-                                    <span class="getpaid-invoice-meta-<?php echo sanitize_html_class( $key ); ?>-value"><?php echo wp_kses_post( $data['value'] ); ?></span>
+                                    <span class="getpaid-invoice-meta-<?php echo sanitize_html_class($key); ?>-value"><?php echo wp_kses_post($data['value']); ?></span>
                                 </td>
 
                             </tr>
 
-                            <?php do_action( "getpaid_after_invoice_meta_$key", $invoice, $data ); ?>
+                            <?php do_action("getpaid_after_invoice_meta_$key", $invoice, $data); ?>
 
                         <?php endif; ?>
                     
                     <?php endforeach; ?>
-                    <?php do_action( "getpaid_after_invoice_meta_rows", $invoice ); ?>
+                    <?php do_action("getpaid_after_invoice_meta_rows", $invoice); ?>
 
                 </tbody>
             </table>
-            <?php do_action( 'getpaid_after_invoice_meta_table', $invoice ); ?>
+            <?php do_action('getpaid_after_invoice_meta_table', $invoice); ?>
 
 
         </div>
-        <?php do_action( 'getpaid_after_invoice_meta', $invoice ); ?>
+        <?php do_action('getpaid_after_invoice_meta', $invoice); ?>
 
 <?php

templates/invoice/fee-item.php

Spacing +20 added lines, -20 removed lines

@@ -9,9 +9,9 @@ 
  * @var array $fee
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_before_invoice_fee_item', $invoice, $fee );
+do_action('getpaid_before_invoice_fee_item', $invoice, $fee);
 
 ?>
 
@@ -19,66 +19,66 @@ 
 
     <div class="form-row">
 
-        <?php foreach ( array_keys( $columns ) as $column ): ?>
+        <?php foreach (array_keys($columns) as $column): ?>
 
-            <div class="<?php echo 'name' == $column ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-invoice-item-<?php echo sanitize_html_class( $column ); ?>">
+            <div class="<?php echo 'name' == $column ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-invoice-item-<?php echo sanitize_html_class($column); ?>">
 
                 <?php
 
                     // Fires before printing a fee item column.
-                    do_action( "getpaid_invoice_fee_item_before_$column", $fee, $invoice );
+                    do_action("getpaid_invoice_fee_item_before_$column", $fee, $invoice);
 
                     // Item name.
-                    if ( 'name' == $column ) {
+                    if ('name' == $column) {
 
                         // Display the name.
-                        echo '<div class="mb-1">' . esc_html( $fee['name'] ) . '</div>';
+                        echo '<div class="mb-1">' . esc_html($fee['name']) . '</div>';
 
                         // And an optional description.
-                        $description = empty( $fee['description'] ) ? esc_html__( 'Fee', 'invoicing' ) : esc_html( $fee['description'] );
+                        $description = empty($fee['description']) ? esc_html__('Fee', 'invoicing') : esc_html($fee['description']);
                         echo "<small class='form-text text-muted pr-2 m-0'>$description</small>";
 
                     }
 
                     // Item price.
-                    if ( 'price' == $column ) {
+                    if ('price' == $column) {
 
                         // Display the item price (or recurring price if this is a renewal invoice)
-                        if ( $invoice->is_recurring() && $invoice->is_renewal() ) {
-                            echo wpinv_price( $fee['recurring_fee'], $invoice->get_currency() );
+                        if ($invoice->is_recurring() && $invoice->is_renewal()) {
+                            echo wpinv_price($fee['recurring_fee'], $invoice->get_currency());
                         } else {
-                            echo wpinv_price( $fee['initial_fee'], $invoice->get_currency() );
+                            echo wpinv_price($fee['initial_fee'], $invoice->get_currency());
                         }
 
                     }
 
                     // Item quantity.
-                    if ( 'quantity' == $column ) {
+                    if ('quantity' == $column) {
                         echo "&mdash;";
                     }
 
                     // Item tax.
-                    if ( 'tax_rate' == $column ) {
+                    if ('tax_rate' == $column) {
                         echo "&mdash;";
                     }
 
                     // Item sub total.
-                    if ( 'subtotal' == $column ) {
+                    if ('subtotal' == $column) {
 
                         // Display the item price (or recurring price if this is a renewal invoice)
-                        if ( $invoice->is_recurring() && $invoice->is_renewal() ) {
-                            echo wpinv_price( $fee['recurring_fee'], $invoice->get_currency() );
+                        if ($invoice->is_recurring() && $invoice->is_renewal()) {
+                            echo wpinv_price($fee['recurring_fee'], $invoice->get_currency());
                         } else {
-                            echo wpinv_price( $fee['initial_fee'], $invoice->get_currency() );
+                            echo wpinv_price($fee['initial_fee'], $invoice->get_currency());
                         }
 
                     }
 
                     // Fires when printing a fee item column.
-                    do_action( "getpaid_invoice_fee_item_$column", $fee, $invoice );
+                    do_action("getpaid_invoice_fee_item_$column", $fee, $invoice);
 
                     // Fires after printing a fee item column.
-                    do_action( "getpaid_invoice_fee_item_after_$column", $fee, $invoice );
+                    do_action("getpaid_invoice_fee_item_after_$column", $fee, $invoice);
 
                 ?>
 

templates/wpinv-invoice-print.php

Spacing +10 added lines, -10 removed lines

@@ -7,20 +7,20 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Fetch the invoice.
-if ( empty( $invoice ) ) {
-    $invoice = new WPInv_Invoice( $GLOBALS['post'] );
+if (empty($invoice)) {
+    $invoice = new WPInv_Invoice($GLOBALS['post']);
 }
 
 // Abort if it does not exist.
-if ( $invoice->get_id() == 0 ) {
+if ($invoice->get_id() == 0) {
     exit;
 }
 
 // Fires before printing an invoice.
-do_action( 'wpinv_invoice_print_before_display', $invoice );
+do_action('wpinv_invoice_print_before_display', $invoice);
 
 ?><!DOCTYPE html>
 
@@ -29,24 +29,24 @@ 
 
     <head>
 
-		<meta charset="<?php bloginfo( 'charset' ); ?>">
+		<meta charset="<?php bloginfo('charset'); ?>">
         <meta name="viewport" content="width=device-width, initial-scale=1.0" >
 
         <meta name="robots" content="noindex,nofollow">
 
 		<link rel="profile" href="https://gmpg.org/xfn/11">
 
-        <title>#<?php echo esc_html( $invoice->get_number() ); ?></title>
+        <title>#<?php echo esc_html($invoice->get_number()); ?></title>
 
-        <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_head', $invoice); ?>
 
     </head>
 
 
     <body class="body wpinv wpinv-print" style="font-weight: 400;">
 
-        <?php do_action( 'getpaid_invoice', $invoice ); ?>
-        <?php do_action( 'wpinv_invoice_print_body_end', $invoice ); ?>
+        <?php do_action('getpaid_invoice', $invoice); ?>
+        <?php do_action('wpinv_invoice_print_body_end', $invoice); ?>
 
     </body>
 

templates/payment-forms-admin/previews/ip_address.php

Spacing +2 added lines, -2 removed lines

@@ -7,10 +7,10 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 <span>{{form_element.text}}</span>
 <a target='_blank' href="#">
-    <?php echo esc_html( wpinv_get_ip() ); ?>&nbsp;&nbsp;<i class='fa fa-external-link-square' aria-hidden='true'></i>
+    <?php echo esc_html(wpinv_get_ip()); ?>&nbsp;&nbsp;<i class='fa fa-external-link-square' aria-hidden='true'></i>
 </a>

includes/admin/register-settings.php

Indentation +301 added lines, -301 removed lines

@@ -195,13 +195,13 @@ 
     $name       = isset( $option['name'] ) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+    $is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
-		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
-	}
+    if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
+        $tip   = wpinv_clean( $option['desc'] );
+        $name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
+        unset( $option['desc'] );
+    }
 
     // Loop through all tabs.
     add_settings_field(
@@ -228,9 +228,9 @@ 
             'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
             'onchange'    => isset( $option['onchange'] )   ? $option['onchange']     : '',
             'custom'      => isset( $option['custom'] )     ? $option['custom']       : '',
-			'default_content' => isset( $option['default_content'] )     ? $option['default_content']       : '',
-			'class'       => isset( $option['class'] )     ? $option['class']         : '',
-			'style'       => isset( $option['style'] )     ? $option['style']         : '',
+            'default_content' => isset( $option['default_content'] )     ? $option['default_content']       : '',
+            'class'       => isset( $option['class'] )     ? $option['class']         : '',
+            'style'       => isset( $option['style'] )     ? $option['style']         : '',
             'cols'        => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
             'rows'        => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
@@ -244,7 +244,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+    return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
 }
 
 /**
@@ -263,18 +263,18 @@ 
  */
 function wpinv_settings_sanitize( $input = array() ) {
 
-	$wpinv_options = wpinv_get_options();
-	$raw_referrer  = wp_get_raw_referer();
+    $wpinv_options = wpinv_get_options();
+    $raw_referrer  = wp_get_raw_referer();
 
     if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+        return array_merge( $wpinv_options, $input );
     }
 
     wp_parse_str( $raw_referrer, $referrer );
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
-	}
+    if ( in_array( 'gp-setup', $referrer ) ) {
+        return array_merge( $wpinv_options, $input );
+    }
 
     $settings = wpinv_get_registered_settings();
     $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
@@ -296,10 +296,10 @@ 
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
 
-		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+        // Key specific filter.
+        $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
@@ -342,14 +342,14 @@ 
 
     foreach ( $new_rates as $rate ) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
-		$tax_rates[]     = $rate;
+        $rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
+        $rate['name']    = sanitize_text_field( $rate['name'] );
+        $rate['state']   = sanitize_text_field( $rate['state'] );
+        $rate['country'] = sanitize_text_field( $rate['country'] );
+        $rate['global']  = empty( $rate['state'] );
+        $tax_rates[]     = $rate;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rates', $tax_rates );
 
@@ -362,11 +362,11 @@ 
     $tabs['general']  = __( 'General', 'invoicing' );
     $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
     $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['emails']   = __( 'Emails', 'invoicing' );
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
-	}
+    if ( count( getpaid_get_integration_settings() ) > 0 ) {
+        $tabs['integrations'] = __( 'Integrations', 'invoicing' );
+    }
 
     $tabs['privacy']  = __( 'Privacy', 'invoicing' );
     $tabs['misc']     = __( 'Misc', 'invoicing' );
@@ -405,14 +405,14 @@ 
         ) ),
         'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
             'main'  => __( 'Tax Settings', 'invoicing' ),
-			'rates' => __( 'Tax Rates', 'invoicing' ),
-			'vat'   => __( 'EU VAT Settings', 'invoicing' )
+            'rates' => __( 'Tax Rates', 'invoicing' ),
+            'vat'   => __( 'EU VAT Settings', 'invoicing' )
         ) ),
         'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
             'main' => __( 'Email Settings', 'invoicing' ),
-		) ),
+        ) ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+        'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
 
         'privacy' => apply_filters( 'wpinv_settings_sections_privacy', array(
             'main' => __( 'Privacy policy', 'invoicing' ),
@@ -432,48 +432,48 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if( $default_label !== NULL && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+    if ( !empty( $args['desc'] ) ) {
         echo $args['desc'];
     }
 }
 
 function wpinv_hidden_callback( $args ) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	}
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    }
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
 
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    $html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
     
-	echo $html;
+    echo $html;
 }
 
 /**
@@ -481,12 +481,12 @@ 
  */
 function wpinv_checkbox_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    $id  = esc_attr( $args['id'] );
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
-	?>
+    getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+    ?>
 		<fieldset>
 			<label>
 				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox">
@@ -498,75 +498,75 @@ 
 
 function wpinv_multicheck_callback( $args ) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+    if ( ! empty( $args['options'] ) ) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+        $std     = isset( $args['std'] ) ? $args['std'] : array();
+        $value   = wpinv_get_option( $args['id'], $std );
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
         foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( in_array( $sanitize_key, $value ) ) { 
-				$enabled = $sanitize_key;
-			} else { 
-				$enabled = NULL; 
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . $args['desc'] . '</p>';
-	}
+            $sanitize_key = wpinv_sanitize_key( $key );
+            if ( in_array( $sanitize_key, $value ) ) { 
+                $enabled = $sanitize_key;
+            } else { 
+                $enabled = NULL; 
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . $args['desc'] . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false);
+    $value   = wpinv_get_option( $args['id'], false);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
             
-			if( empty( $value ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = NULL;
-			}
-
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
-
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-						$content_dir = WP_CONTENT_DIR;
-
-						if ( function_exists( 'wp_normalize_path' ) ) {
-							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
-						}
-
-						$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo $option . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if( empty( $value ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = NULL;
+            }
+
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                    echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                    $card = strtolower( str_replace( ' ', '', $option ) );
+
+                    if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                        $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                        $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                        $content_dir = WP_CONTENT_DIR;
+
+                        if ( function_exists( 'wp_normalize_path' ) ) {
+                            // Replaces backslashes with forward slashes for Windows systems
+                            $image = wp_normalize_path( $image );
+                            $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                        $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                    echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo $option . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 /**
@@ -574,9 +574,9 @@ 
  */
 function wpinv_radio_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	?>
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    ?>
 		<fieldset>
 			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
 				<?php foreach( $args['options'] as $key => $option ) : ?>
@@ -590,7 +590,7 @@ 
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+    getpaid_settings_description_callback( $args );
 }
 
 /**
@@ -598,10 +598,10 @@ 
  */
 function getpaid_settings_description_callback( $args ) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = wp_kses_post( $args['desc'] );
-		echo "<p class='description'>$description</p>";
-	}
+    if ( ! empty( $args['desc'] ) ) {
+        $description = wp_kses_post( $args['desc'] );
+        echo "<p class='description'>$description</p>";
+    }
 
 }
 
@@ -610,7 +610,7 @@ 
  */
 function wpinv_gateways_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -624,22 +624,22 @@ 
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+    echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    foreach ( $args['options'] as $key => $option ) :
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             $selected = selected( $key, $args['selected'], false );
         } else {
             $selected = selected( $key, $value, false );
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 /**
@@ -650,29 +650,29 @@ 
  */
 function wpinv_settings_attrs_helper( $args ) {
 
-	$value        = isset( $args['std'] ) ? $args['std'] : '';
-	$id           = esc_attr( $args['id'] );
-	$placeholder  = esc_attr( $args['placeholder'] );
+    $value        = isset( $args['std'] ) ? $args['std'] : '';
+    $id           = esc_attr( $args['id'] );
+    $placeholder  = esc_attr( $args['placeholder'] );
 
-	if ( ! empty( $args['faux'] ) ) {
-		$args['readonly'] = true;
-		$name             = '';
-	} else {
-		$value  = wpinv_get_option( $args['id'], $value );
-		$name   = "wpinv_settings[$id]";
-	}
+    if ( ! empty( $args['faux'] ) ) {
+        $args['readonly'] = true;
+        $name             = '';
+    } else {
+        $value  = wpinv_get_option( $args['id'], $value );
+        $name   = "wpinv_settings[$id]";
+    }
 
-	$value    = is_scalar( $value ) ? esc_attr( $value ) : '';
-	$class    = esc_attr( $args['class'] );
-	$style    = esc_attr( $args['style'] );
-	$readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
+    $value    = is_scalar( $value ) ? esc_attr( $value ) : '';
+    $class    = esc_attr( $args['class'] );
+    $style    = esc_attr( $args['style'] );
+    $readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
 
-	$onchange = '';
+    $onchange = '';
     if ( ! empty( $args['onchange'] ) ) {
         $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
-	}
+    }
 
-	return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
+    return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
 }
 
 /**
@@ -680,11 +680,11 @@ 
  */
 function wpinv_text_callback( $args ) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
+    $desc = wp_kses_post( $args['desc'] );
+    $desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr = wpinv_settings_attrs_helper( $args );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="text" <?php echo $attr; ?>>
 			<?php echo $desc; ?>
@@ -698,14 +698,14 @@ 
  */
 function wpinv_number_callback( $args ) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
-	$max  = intval( $args['max'] );
-	$min  = intval( $args['min'] );
-	$step = floatval( $args['step'] );
+    $desc = wp_kses_post( $args['desc'] );
+    $desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr = wpinv_settings_attrs_helper( $args );
+    $max  = intval( $args['max'] );
+    $min  = intval( $args['min'] );
+    $step = floatval( $args['step'] );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="number" step="<?php echo $step; ?>" max="<?php echo $max; ?>" min="<?php echo $min; ?>" <?php echo $attr; ?>>
 			<?php echo $desc; ?>
@@ -717,36 +717,36 @@ 
 function wpinv_textarea_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    $html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_password_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_missing_callback($args) {
-	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . $args['id'] . '</strong>'
-	);
+    printf(
+        __( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . $args['id'] . '</strong>'
+    );
 }
 
 /**
@@ -754,14 +754,14 @@ 
  */
 function wpinv_select_callback( $args ) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr   = wpinv_settings_attrs_helper( $args );
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+    $desc   = wp_kses_post( $args['desc'] );
+    $desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $attr   = wpinv_settings_attrs_helper( $args );
+    $value  = isset( $args['std'] ) ? $args['std'] : '';
+    $value  = wpinv_get_option( $args['id'], $value );
+    $rand   = uniqid( 'random_id' );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<select <?php echo $attr; ?> data-allow-clear="true">
 				<?php foreach ( $args['options'] as $option => $name ) : ?>
@@ -794,104 +794,104 @@ 
 function wpinv_color_select_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wp_version;
+    global $wp_version;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 	
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
-		$value = $std;
-	}
+    if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+        $value = $std;
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	$html = '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
-		$html .= ob_get_clean();
-	} else {
-		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    $html = '<div class="getpaid-settings-editor-input">';
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        ob_start();
+        wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+        $html .= ob_get_clean();
+    } else {
+        $html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_upload_callback( $args ) {
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_callback( $args ) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
+    $std         = isset( $args['std'] ) ? $args['std'] : '';
+    $value       = wpinv_get_option( $args['id'], $std );
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_country_states_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 /**
@@ -899,7 +899,7 @@ 
  */
 function wpinv_tax_rates_callback() {
 	
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -914,17 +914,17 @@ 
  * Displays a tax rate' edit row.
  */
 function wpinv_tax_rate_callback( $tax_rate, $key, $echo = true ) {
-	ob_start();
+    ob_start();
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+    $key                      = sanitize_key( $key );
+    $tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
+    include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
 
-	if ( $echo ) {
-		echo ob_get_clean();
-	} else {
-		return ob_get_clean(); 
-	}
+    if ( $echo ) {
+        echo ob_get_clean();
+    } else {
+        return ob_get_clean(); 
+    }
 
 }
 
@@ -952,14 +952,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 			<tr>
@@ -969,14 +969,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 			<tr>
@@ -986,14 +986,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
                 </td>
             </tr>
 
@@ -1004,14 +1004,14 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>" class="button button-primary"><?php _e( 'Run', 'invoicing' );?></a>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>" class="button button-primary"><?php _e( 'Run', 'invoicing' );?></a>
                 </td>
             </tr>
 
@@ -1022,8 +1022,8 @@ 
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
-					?>" class="button button-primary"><?php _e( 'Launch', 'invoicing' );?></a>
+                        echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
+                    ?>" class="button button-primary"><?php _e( 'Launch', 'invoicing' );?></a>
                 </td>
             </tr>
 
@@ -1037,19 +1037,19 @@ 
 
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_raw_html_callback( $args ) {
-	echo $args['desc'];
+    echo $args['desc'];
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 
@@ -1073,15 +1073,15 @@ 
  */
 function wpinv_get_merge_tags_help_text( $subscription = false ) {
 
-	$url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
-	$link = sprintf(
-		'<strong><a href="%s" target="_blank">%s</a></strong>',
-		$url,
-		esc_html__( 'View available merge tags.', 'wpinv-quotes' )
-	);
+    $url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
+    $link = sprintf(
+        '<strong><a href="%s" target="_blank">%s</a></strong>',
+        $url,
+        esc_html__( 'View available merge tags.', 'wpinv-quotes' )
+    );
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+    $description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
 
-	return "$description $link";
+    return "$description $link";
 
 }

Spacing +373 added lines, -373 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves all default settings.
@@ -16,13 +16,13 @@ 
 function wpinv_get_settings() {
     $defaults = array();
 
-    foreach ( array_values( wpinv_get_registered_settings() ) as $tab_settings ) {
+    foreach (array_values(wpinv_get_registered_settings()) as $tab_settings) {
 
-        foreach ( array_values( $tab_settings ) as $section_settings ) {
+        foreach (array_values($tab_settings) as $section_settings) {
 
-            foreach ( $section_settings as $key => $setting ) {
-                if ( isset( $setting['std'] ) ) {
-                    $defaults[ $key ] = $setting['std'];
+            foreach ($section_settings as $key => $setting) {
+                if (isset($setting['std'])) {
+                    $defaults[$key] = $setting['std'];
                 }
             }
 
@@ -43,12 +43,12 @@ 
     global $wpinv_options;
 
     // Try fetching the saved options.
-    if ( empty( $wpinv_options ) ) {
-        $wpinv_options = get_option( 'wpinv_settings' );
+    if (empty($wpinv_options)) {
+        $wpinv_options = get_option('wpinv_settings');
     }
 
     // If that fails, don't fetch the default settings to prevent a loop.
-    if ( ! is_array( $wpinv_options ) ) {
+    if (!is_array($wpinv_options)) {
         $wpinv_options = array();
     }
 
@@ -62,13 +62,13 @@ 
  * @param mixed $default The default value to use if the setting has not been set.
  * @return mixed
  */
-function wpinv_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
 
     $options = wpinv_get_options();
-    $value   = isset( $options[ $key ] ) ? $options[ $key ] : $default;
-    $value   = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value   = isset($options[$key]) ? $options[$key] : $default;
+    $value   = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
 /**
@@ -77,11 +77,11 @@ 
  * @param array $options the new options.
  * @return bool
  */
-function wpinv_update_options( $options ) {
+function wpinv_update_options($options) {
     global $wpinv_options;
 
     // update the option.
-    if ( is_array( $options ) && update_option( 'wpinv_settings', $options ) ) {
+    if (is_array($options) && update_option('wpinv_settings', $options)) {
         $wpinv_options = $options;
         return true;
     }
@@ -96,24 +96,24 @@ 
  * @param mixed $value The setting value.
  * @return bool
  */
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
 
     // If no key, exit.
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // Maybe delete the option instead.
-    if ( is_null( $value ) ) {
-        return wpinv_delete_option( $key );
+    if (is_null($value)) {
+        return wpinv_delete_option($key);
     }
 
     // Prepare the new options.
     $options         = wpinv_get_options();
-    $options[ $key ] = apply_filters( 'wpinv_update_option', $value, $key );
+    $options[$key] = apply_filters('wpinv_update_option', $value, $key);
 
     // Save the new options.
-    return wpinv_update_options( $options );
+    return wpinv_update_options($options);
 
 }
 
@@ -123,18 +123,18 @@ 
  * @param string $key the setting key.
  * @return bool
  */
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
 
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     $options = wpinv_get_options();
 
-    if ( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
-        return wpinv_update_options( $options );
+    if (isset($options[$key])) {
+        unset($options[$key]);
+        return wpinv_update_options($options);
     }
 
     return true;
@@ -148,14 +148,14 @@ 
 function wpinv_register_settings() {
 
     // Loop through all tabs.
-    foreach ( wpinv_get_registered_settings() as $tab => $sections ) {
+    foreach (wpinv_get_registered_settings() as $tab => $sections) {
 
         // In each tab, loop through sections.
-        foreach ( $sections as $section => $settings ) {
+        foreach ($sections as $section => $settings) {
 
             // Check for backwards compatibility
-            $section_tabs = wpinv_get_settings_tab_sections( $tab );
-            if ( ! is_array( $section_tabs ) || ! array_key_exists( $section, $section_tabs ) ) {
+            $section_tabs = wpinv_get_settings_tab_sections($tab);
+            if (!is_array($section_tabs) || !array_key_exists($section, $section_tabs)) {
                 $section = 'main';
                 $settings = $sections;
             }
@@ -168,9 +168,9 @@ 
                 'wpinv_settings_' . $tab . '_' . $section
             );
 
-            foreach ( $settings as $option ) {
-                if ( ! empty( $option['id'] ) ) {
-                    wpinv_register_settings_option( $tab, $section, $option );
+            foreach ($settings as $option) {
+                if (!empty($option['id'])) {
+                    wpinv_register_settings_option($tab, $section, $option);
                 }
             }
 
@@ -178,9 +178,9 @@ 
     }
 
     // Creates our settings in the options table.
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 /**
  * Register a single settings option.
@@ -190,49 +190,49 @@ 
  * @param string $option
  * 
  */
-function wpinv_register_settings_option( $tab, $section, $option ) {
+function wpinv_register_settings_option($tab, $section, $option) {
 
-    $name       = isset( $option['name'] ) ? $option['name'] : '';
+    $name       = isset($option['name']) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+	$is_wizzard = is_admin() && isset($_GET['page']) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
+	if (isset($option['desc']) && (!$is_wizzard && !empty($option['help-tip']))) {
+		$tip   = wpinv_clean($option['desc']);
 		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
+		unset($option['desc']);
 	}
 
     // Loop through all tabs.
     add_settings_field(
         'wpinv_settings[' . $option['id'] . ']',
         $name,
-        function_exists( $cb ) ? $cb : 'wpinv_missing_callback',
+        function_exists($cb) ? $cb : 'wpinv_missing_callback',
         $section,
         $section,
         array(
             'section'     => $section,
-            'id'          => isset( $option['id'] )          ? $option['id']          : uniqid( 'wpinv-' ),
-            'desc'        => isset( $option['desc'] )        ? $option['desc']        : '',
+            'id'          => isset($option['id']) ? $option['id'] : uniqid('wpinv-'),
+            'desc'        => isset($option['desc']) ? $option['desc'] : '',
             'name'        => $name,
-            'size'        => isset( $option['size'] )        ? $option['size']        : null,
-            'options'     => isset( $option['options'] )     ? $option['options']     : '',
-            'selected'    => isset( $option['selected'] )    ? $option['selected']    : null,
-            'std'         => isset( $option['std'] )         ? $option['std']         : '',
-            'min'         => isset( $option['min'] )         ? $option['min']         : 0,
-            'max'         => isset( $option['max'] )         ? $option['max']         : 999999,
-            'step'        => isset( $option['step'] )        ? $option['step']        : 1,
-            'placeholder' => isset( $option['placeholder'] ) ? $option['placeholder'] : null,
-            'allow_blank' => isset( $option['allow_blank'] ) ? $option['allow_blank'] : true,
-            'readonly'    => isset( $option['readonly'] )    ? $option['readonly']    : false,
-            'faux'        => isset( $option['faux'] )        ? $option['faux']        : false,
-            'onchange'    => isset( $option['onchange'] )   ? $option['onchange']     : '',
-            'custom'      => isset( $option['custom'] )     ? $option['custom']       : '',
-			'default_content' => isset( $option['default_content'] )     ? $option['default_content']       : '',
-			'class'       => isset( $option['class'] )     ? $option['class']         : '',
-			'style'       => isset( $option['style'] )     ? $option['style']         : '',
-            'cols'        => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
-            'rows'        => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
+            'size'        => isset($option['size']) ? $option['size'] : null,
+            'options'     => isset($option['options']) ? $option['options'] : '',
+            'selected'    => isset($option['selected']) ? $option['selected'] : null,
+            'std'         => isset($option['std']) ? $option['std'] : '',
+            'min'         => isset($option['min']) ? $option['min'] : 0,
+            'max'         => isset($option['max']) ? $option['max'] : 999999,
+            'step'        => isset($option['step']) ? $option['step'] : 1,
+            'placeholder' => isset($option['placeholder']) ? $option['placeholder'] : null,
+            'allow_blank' => isset($option['allow_blank']) ? $option['allow_blank'] : true,
+            'readonly'    => isset($option['readonly']) ? $option['readonly'] : false,
+            'faux'        => isset($option['faux']) ? $option['faux'] : false,
+            'onchange'    => isset($option['onchange']) ? $option['onchange'] : '',
+            'custom'      => isset($option['custom']) ? $option['custom'] : '',
+			'default_content' => isset($option['default_content']) ? $option['default_content'] : '',
+			'class'       => isset($option['class']) ? $option['class'] : '',
+			'style'       => isset($option['style']) ? $option['style'] : '',
+            'cols'        => isset($option['cols']) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
+            'rows'        => isset($option['rows']) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
     );
 
@@ -244,7 +244,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+	return array_filter(apply_filters('wpinv_registered_settings', wpinv_get_data('admin-settings')));
 }
 
 /**
@@ -253,7 +253,7 @@ 
  * @return array
  */
 function getpaid_get_integration_settings() {
-    return apply_filters( 'getpaid_integration_settings', array() );
+    return apply_filters('getpaid_integration_settings', array());
 }
 
 /**
@@ -261,126 +261,126 @@ 
  * 
  * @return array
  */
-function wpinv_settings_sanitize( $input = array() ) {
+function wpinv_settings_sanitize($input = array()) {
 
 	$wpinv_options = wpinv_get_options();
 	$raw_referrer  = wp_get_raw_referer();
 
-    if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+    if (empty($raw_referrer)) {
+		return array_merge($wpinv_options, $input);
     }
 
-    wp_parse_str( $raw_referrer, $referrer );
+    wp_parse_str($raw_referrer, $referrer);
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+	if (in_array('gp-setup', $referrer)) {
+		return array_merge($wpinv_options, $input);
 	}
 
     $settings = wpinv_get_registered_settings();
-    $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
-    $section  = isset( $referrer['section'] ) ? $referrer['section'] : 'main';
+    $tab      = isset($referrer['tab']) ? $referrer['tab'] : 'general';
+    $section  = isset($referrer['section']) ? $referrer['section'] : 'main';
 
     $input = $input ? $input : array();
-    $input = apply_filters( 'wpinv_settings_tab_' . $tab . '_sanitize', $input );
-    $input = apply_filters( 'wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input );
+    $input = apply_filters('wpinv_settings_tab_' . $tab . '_sanitize', $input);
+    $input = apply_filters('wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input);
 
     // Loop through each setting being saved and pass it through a sanitization filter
-    foreach ( $input as $key => $value ) {
+    foreach ($input as $key => $value) {
 
         // Get the setting type (checkbox, select, etc)
-        $type = isset( $settings[ $tab ][$section][ $key ]['type'] ) ? $settings[ $tab ][$section][ $key ]['type'] : false;
+        $type = isset($settings[$tab][$section][$key]['type']) ? $settings[$tab][$section][$key]['type'] : false;
 
-        if ( $type ) {
+        if ($type) {
             // Field type specific filter
-            $input[$key] = apply_filters( "wpinv_settings_sanitize_$type", $value, $key );
+            $input[$key] = apply_filters("wpinv_settings_sanitize_$type", $value, $key);
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+		$input[$key] = apply_filters('wpinv_settings_sanitize', $input[$key], $key);
 
 		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+		$input[$key] = apply_filters("wpinv_settings_sanitize_$key", $input[$key]);
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
-    $main_settings    = isset( $settings[ $tab ] ) ? $settings[ $tab ] : array(); // Check for extensions that aren't using new sections
-    $section_settings = ! empty( $settings[ $tab ][ $section ] ) ? $settings[ $tab ][ $section ] : array();
+    $main_settings    = isset($settings[$tab]) ? $settings[$tab] : array(); // Check for extensions that aren't using new sections
+    $section_settings = !empty($settings[$tab][$section]) ? $settings[$tab][$section] : array();
 
-    $found_settings   = array_merge( $main_settings, $section_settings );
+    $found_settings   = array_merge($main_settings, $section_settings);
 
-    if ( ! empty( $found_settings ) ) {
-        foreach ( $found_settings as $key => $value ) {
+    if (!empty($found_settings)) {
+        foreach ($found_settings as $key => $value) {
 
             // settings used to have numeric keys, now they have keys that match the option ID. This ensures both methods work
-            if ( is_numeric( $key ) ) {
+            if (is_numeric($key)) {
                 $key = $value['id'];
             }
 
-            if ( ! isset( $input[ $key ] ) && isset( $wpinv_options[ $key ] ) ) {
-                unset( $wpinv_options[ $key ] );
+            if (!isset($input[$key]) && isset($wpinv_options[$key])) {
+                unset($wpinv_options[$key]);
             }
         }
     }
 
     // Merge our new settings with the existing
-    $output = array_merge( $wpinv_options, $input );
+    $output = array_merge($wpinv_options, $input);
 
-    add_settings_error( 'wpinv-notices', '', __( 'Settings updated.', 'invoicing' ), 'updated' );
+    add_settings_error('wpinv-notices', '', __('Settings updated.', 'invoicing'), 'updated');
 
     return $output;
 }
-add_filter( 'wpinv_settings_sanitize_text', 'trim', 10, 1 );
-add_filter( 'wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount' );
+add_filter('wpinv_settings_sanitize_text', 'trim', 10, 1);
+add_filter('wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount');
 
-function wpinv_settings_sanitize_tax_rates( $input ) {
-    if( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-    $new_rates = ! empty( $_POST['tax_rates'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rates'] ) ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? wp_kses_post_deep(array_values($_POST['tax_rates'])) : array();
     $tax_rates = array();
 
-    foreach ( $new_rates as $rate ) {
+    foreach ($new_rates as $rate) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
+		$rate['rate']    = wpinv_sanitize_amount($rate['rate']);
+		$rate['name']    = sanitize_text_field($rate['name']);
+		$rate['state']   = sanitize_text_field($rate['state']);
+		$rate['country'] = sanitize_text_field($rate['country']);
+		$rate['global']  = empty($rate['state']);
 		$tax_rates[]     = $rate;
 
 	}
 
-    update_option( 'wpinv_tax_rates', $tax_rates );
+    update_option('wpinv_tax_rates', $tax_rates);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates' );
+add_filter('wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates');
 
 function wpinv_get_settings_tabs() {
     $tabs             = array();
-    $tabs['general']  = __( 'General', 'invoicing' );
-    $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
-    $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['general']  = __('General', 'invoicing');
+    $tabs['gateways'] = __('Payment Gateways', 'invoicing');
+    $tabs['taxes']    = __('Taxes', 'invoicing');
+	$tabs['emails'] = __('Emails', 'invoicing');
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
+	if (count(getpaid_get_integration_settings()) > 0) {
+		$tabs['integrations'] = __('Integrations', 'invoicing');
 	}
 
-    $tabs['privacy']  = __( 'Privacy', 'invoicing' );
-    $tabs['misc']     = __( 'Misc', 'invoicing' );
-    $tabs['tools']    = __( 'Tools', 'invoicing' );
+    $tabs['privacy']  = __('Privacy', 'invoicing');
+    $tabs['misc']     = __('Misc', 'invoicing');
+    $tabs['tools']    = __('Tools', 'invoicing');
 
-    return apply_filters( 'wpinv_settings_tabs', $tabs );
+    return apply_filters('wpinv_settings_tabs', $tabs);
 }
 
-function wpinv_get_settings_tab_sections( $tab = false ) {
+function wpinv_get_settings_tab_sections($tab = false) {
     $tabs     = false;
     $sections = wpinv_get_registered_settings_sections();
 
-    if( $tab && ! empty( $sections[ $tab ] ) ) {
-        $tabs = $sections[ $tab ];
+    if ($tab && !empty($sections[$tab])) {
+        $tabs = $sections[$tab];
     }
 
     return $tabs;
@@ -389,89 +389,89 @@ 
 function wpinv_get_registered_settings_sections() {
     static $sections = false;
 
-    if ( false !== $sections ) {
+    if (false !== $sections) {
         return $sections;
     }
 
     $sections = array(
-        'general' => apply_filters( 'wpinv_settings_sections_general', array(
-            'main' => __( 'General Settings', 'invoicing' ),
-            'page_section' => __( 'Page Settings', 'invoicing' ),
-            'currency_section' => __( 'Currency Settings', 'invoicing' ),
-            'labels' => __( 'Label Texts', 'invoicing' ),
-        ) ),
-        'gateways' => apply_filters( 'wpinv_settings_sections_gateways', array(
-            'main' => __( 'Gateway Settings', 'invoicing' ),
-        ) ),
-        'taxes' => apply_filters( 'wpinv_settings_sections_taxes', array(
-            'main'  => __( 'Tax Settings', 'invoicing' ),
-			'rates' => __( 'Tax Rates', 'invoicing' ),
-			'vat'   => __( 'EU VAT Settings', 'invoicing' )
-        ) ),
-        'emails' => apply_filters( 'wpinv_settings_sections_emails', array(
-            'main' => __( 'Email Settings', 'invoicing' ),
-		) ),
-
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
-
-        'privacy' => apply_filters( 'wpinv_settings_sections_privacy', array(
-            'main' => __( 'Privacy policy', 'invoicing' ),
-        ) ),
-        'misc' => apply_filters( 'wpinv_settings_sections_misc', array(
-            'main' => __( 'Miscellaneous', 'invoicing' ),
-            'custom-css' => __( 'Custom CSS', 'invoicing' ),
-        ) ),
-        'tools' => apply_filters( 'wpinv_settings_sections_tools', array(
-            'main' => __( 'Diagnostic Tools', 'invoicing' ),
-        ) ),
+        'general' => apply_filters('wpinv_settings_sections_general', array(
+            'main' => __('General Settings', 'invoicing'),
+            'page_section' => __('Page Settings', 'invoicing'),
+            'currency_section' => __('Currency Settings', 'invoicing'),
+            'labels' => __('Label Texts', 'invoicing'),
+        )),
+        'gateways' => apply_filters('wpinv_settings_sections_gateways', array(
+            'main' => __('Gateway Settings', 'invoicing'),
+        )),
+        'taxes' => apply_filters('wpinv_settings_sections_taxes', array(
+            'main'  => __('Tax Settings', 'invoicing'),
+			'rates' => __('Tax Rates', 'invoicing'),
+			'vat'   => __('EU VAT Settings', 'invoicing')
+        )),
+        'emails' => apply_filters('wpinv_settings_sections_emails', array(
+            'main' => __('Email Settings', 'invoicing'),
+		)),
+
+		'integrations' => wp_list_pluck(getpaid_get_integration_settings(), 'label', 'id'),
+
+        'privacy' => apply_filters('wpinv_settings_sections_privacy', array(
+            'main' => __('Privacy policy', 'invoicing'),
+        )),
+        'misc' => apply_filters('wpinv_settings_sections_misc', array(
+            'main' => __('Miscellaneous', 'invoicing'),
+            'custom-css' => __('Custom CSS', 'invoicing'),
+        )),
+        'tools' => apply_filters('wpinv_settings_sections_tools', array(
+            'main' => __('Diagnostic Tools', 'invoicing'),
+        )),
     );
 
-    $sections = apply_filters( 'wpinv_settings_sections', $sections );
+    $sections = apply_filters('wpinv_settings_sections', $sections);
 
     return $sections;
 }
 
-function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
+function wpinv_get_pages($with_slug = false, $default_label = NULL) {
 	$pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
+	if ($default_label !== NULL && $default_label !== false) {
+		$pages_options = array('' => $default_label); // Blank option
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
+	if ($pages) {
+		foreach ($pages as $page) {
 			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
-            $pages_options[ $page->ID ] = $title;
+            $pages_options[$page->ID] = $title;
 		}
 	}
 
 	return $pages_options;
 }
 
-function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
         echo $args['desc'];
     }
 }
 
-function wpinv_hidden_callback( $args ) {
+function wpinv_hidden_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	if ( isset( $args['set_value'] ) ) {
+	if (isset($args['set_value'])) {
 		$value = $args['set_value'];
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$name  = '';
+		$name = '';
 	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="wpinv_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key($args['id']) . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '" />';
     
 	echo $html;
 }
@@ -479,59 +479,59 @@ 
 /**
  * Displays a checkbox settings callback.
  */
-function wpinv_checkbox_callback( $args ) {
+function wpinv_checkbox_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
+	$id  = esc_attr($args['id']);
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+	getpaid_hidden_field("wpinv_settings[$id]", '0');
 	?>
 		<fieldset>
 			<label>
-				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox">
-				<?php echo wp_kses_post( $args['desc'] ); ?>
+				<input id="wpinv-settings-<?php echo $id; ?>" name="wpinv_settings[<?php echo $id; ?>]" <?php checked(empty($std), false); ?> value="1" type="checkbox">
+				<?php echo wp_kses_post($args['desc']); ?>
 			</label>
 		</fieldset>
 	<?php
 }
 
-function wpinv_multicheck_callback( $args ) {
+function wpinv_multicheck_callback($args) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+	$sanitize_id = wpinv_sanitize_key($args['id']);
+	$class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+	if (!empty($args['options'])) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+		$std     = isset($args['std']) ? $args['std'] : array();
+		$value   = wpinv_get_option($args['id'], $std);
 
 		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
-        foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( in_array( $sanitize_key, $value ) ) { 
+        foreach ($args['options'] as $key => $option):
+			$sanitize_key = wpinv_sanitize_key($key);
+			if (in_array($sanitize_key, $value)) { 
 				$enabled = $sanitize_key;
 			} else { 
 				$enabled = NULL; 
 			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($sanitize_key) . '" ' . checked($sanitize_key, $enabled, false) . '/>&nbsp;';
+			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post($option) . '</label></div>';
 		endforeach;
 		echo '</div>';
 		echo '<p class="description">' . $args['desc'] . '</p>';
 	}
 }
 
-function wpinv_payment_icons_callback( $args ) {
+function wpinv_payment_icons_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false);
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$value = wpinv_get_option($args['id'], false);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
-            $sanitize_key = wpinv_sanitize_key( $key );
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option) {
+            $sanitize_key = wpinv_sanitize_key($key);
             
-			if( empty( $value ) ) {
+			if (empty($value)) {
 				$enabled = $option;
 			} else {
 				$enabled = NULL;
@@ -539,67 +539,67 @@ 
 
 			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
 
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				if (wpinv_string_is_image_url($key)) {
+					echo '<img class="payment-icon" src="' . esc_url($key) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
+					$card = strtolower(str_replace(' ', '', $option));
 
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+					if (has_filter('wpinv_accepted_payment_' . $card . '_image')) {
+						$image = apply_filters('wpinv_accepted_payment_' . $card . '_image', '');
 					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+						$image       = wpinv_locate_template('images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false);
 						$content_dir = WP_CONTENT_DIR;
 
-						if ( function_exists( 'wp_normalize_path' ) ) {
+						if (function_exists('wp_normalize_path')) {
 							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
+							$image = wp_normalize_path($image);
+							$content_dir = wp_normalize_path($content_dir);
 						}
 
-						$image = str_replace( $content_dir, content_url(), $image );
+						$image = str_replace($content_dir, content_url(), $image);
 					}
 
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+					echo '<img class="payment-icon" src="' . esc_url($image) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				}
 			echo $option . '</label>';
 		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
 /**
  * Displays a radio settings field.
  */
-function wpinv_radio_callback( $args ) {
+function wpinv_radio_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
 	?>
 		<fieldset>
-			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
-				<?php foreach( $args['options'] as $key => $option ) : ?>
+			<ul id="wpinv-settings-<?php echo esc_attr($args['id']); ?>" style="margin-top: 0;">
+				<?php foreach ($args['options'] as $key => $option) : ?>
 					<li>
 						<label>
-							<input name="wpinv_settings[<?php echo esc_attr( $args['id'] ); ?>]" <?php checked( $std, $key ); ?> value="<?php echo esc_attr( $key ); ?>" type="radio">
-							<?php echo wp_kses_post( $option ); ?>
+							<input name="wpinv_settings[<?php echo esc_attr($args['id']); ?>]" <?php checked($std, $key); ?> value="<?php echo esc_attr($key); ?>" type="radio">
+							<?php echo wp_kses_post($option); ?>
 						</label>
 					</li>
 				<?php endforeach; ?>
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+	getpaid_settings_description_callback($args);
 }
 
 /**
  * Displays a description if available.
  */
-function getpaid_settings_description_callback( $args ) {
+function getpaid_settings_description_callback($args) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = wp_kses_post( $args['desc'] );
+	if (!empty($args['desc'])) {
+		$description = wp_kses_post($args['desc']);
 		echo "<p class='description'>$description</p>";
 	}
 
@@ -615,31 +615,31 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-gateways-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-gateways-edit.php'; ?>
 
 	<?php
 }
 
 function wpinv_gateway_select_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+    $class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="' . $class . '" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
-            $selected = selected( $key, $args['selected'], false );
+	foreach ($args['options'] as $key => $option) :
+		if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
+            $selected = selected($key, $args['selected'], false);
         } else {
-            $selected = selected( $key, $value, false );
+            $selected = selected($key, $value, false);
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+		echo '<option value="' . wpinv_sanitize_key($key) . '"' . $selected . '>' . esc_html($option['admin_label']) . '</option>';
 	endforeach;
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 }
 
 /**
@@ -648,28 +648,28 @@ 
  * @param array $args
  * @return string
  */
-function wpinv_settings_attrs_helper( $args ) {
+function wpinv_settings_attrs_helper($args) {
 
-	$value        = isset( $args['std'] ) ? $args['std'] : '';
-	$id           = esc_attr( $args['id'] );
-	$placeholder  = esc_attr( $args['placeholder'] );
+	$value        = isset($args['std']) ? $args['std'] : '';
+	$id           = esc_attr($args['id']);
+	$placeholder  = esc_attr($args['placeholder']);
 
-	if ( ! empty( $args['faux'] ) ) {
+	if (!empty($args['faux'])) {
 		$args['readonly'] = true;
 		$name             = '';
 	} else {
-		$value  = wpinv_get_option( $args['id'], $value );
+		$value  = wpinv_get_option($args['id'], $value);
 		$name   = "wpinv_settings[$id]";
 	}
 
-	$value    = is_scalar( $value ) ? esc_attr( $value ) : '';
-	$class    = esc_attr( $args['class'] );
-	$style    = esc_attr( $args['style'] );
-	$readonly = empty( $args['readonly'] ) ? '' : 'readonly onclick="this.select()"';
+	$value    = is_scalar($value) ? esc_attr($value) : '';
+	$class    = esc_attr($args['class']);
+	$style    = esc_attr($args['style']);
+	$readonly = empty($args['readonly']) ? '' : 'readonly onclick="this.select()"';
 
 	$onchange = '';
-    if ( ! empty( $args['onchange'] ) ) {
-        $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $onchange = ' onchange="' . esc_attr($args['onchange']) . '"';
 	}
 
 	return "name='$name' id='wpinv-settings-$id' style='$style' value='$value' class='$class' placeholder='$placeholder' data-placeholder='$placeholder' $onchange $readonly";
@@ -678,11 +678,11 @@ 
 /**
  * Displays a text input settings callback.
  */
-function wpinv_text_callback( $args ) {
+function wpinv_text_callback($args) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
+	$desc = wp_kses_post($args['desc']);
+	$desc = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$attr = wpinv_settings_attrs_helper($args);
 
 	?>
 		<label style="width: 100%;">
@@ -696,14 +696,14 @@ 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_number_callback( $args ) {
+function wpinv_number_callback($args) {
 
-	$desc = wp_kses_post( $args['desc'] );
-	$desc = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr = wpinv_settings_attrs_helper( $args );
-	$max  = intval( $args['max'] );
-	$min  = intval( $args['min'] );
-	$step = floatval( $args['step'] );
+	$desc = wp_kses_post($args['desc']);
+	$desc = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$attr = wpinv_settings_attrs_helper($args);
+	$max  = intval($args['max']);
+	$min  = intval($args['min']);
+	$step = floatval($args['step']);
 
 	?>
 		<label style="width: 100%;">
@@ -714,37 +714,37 @@ 
 
 }
 
-function wpinv_textarea_callback( $args ) {
+function wpinv_textarea_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $class = (isset($args['class']) && !is_null($args['class'])) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<textarea class="' . sanitize_html_class($class) . ' txtarea-' . sanitize_html_class($size) . ' wpi-' . esc_attr(sanitize_html_class($sanitize_id)) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']">' . esc_textarea(stripslashes($value)) . '</textarea>';
+	$html .= '<br /><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_password_callback( $args ) {
+function wpinv_password_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="password" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '"/>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
 function wpinv_missing_callback($args) {
 	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+		__('The callback function used for the %s setting is missing.', 'invoicing'),
 		'<strong>' . $args['id'] . '</strong>'
 	);
 }
@@ -752,35 +752,35 @@ 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_select_callback( $args ) {
+function wpinv_select_callback($args) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$attr   = wpinv_settings_attrs_helper( $args );
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+	$desc   = wp_kses_post($args['desc']);
+	$desc   = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$attr   = wpinv_settings_attrs_helper($args);
+	$value  = isset($args['std']) ? $args['std'] : '';
+	$value  = wpinv_get_option($args['id'], $value);
+	$rand   = uniqid('random_id');
 
 	?>
 		<label style="width: 100%;">
 			<select <?php echo $attr; ?> data-allow-clear="true">
-				<?php foreach ( $args['options'] as $option => $name ) : ?>
-					<option value="<?php echo esc_attr( $option ); ?>" <?php echo selected( $option, $value ); ?>><?php echo wpinv_clean( $name ); ?></option>
-				<?php endforeach;?>
+				<?php foreach ($args['options'] as $option => $name) : ?>
+					<option value="<?php echo esc_attr($option); ?>" <?php echo selected($option, $value); ?>><?php echo wpinv_clean($name); ?></option>
+				<?php endforeach; ?>
 			</select>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && is_numeric( $value ) ) : ?>
-				<a href="<?php echo get_edit_post_link( $value ); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php _e( 'Edit Page', 'invoicing' ) ?></a>
+			<?php if (substr($args['id'], -5) === '_page' && is_numeric($value)) : ?>
+				<a href="<?php echo get_edit_post_link($value); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php _e('Edit Page', 'invoicing') ?></a>
 			<?php endif; ?>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && ! empty( $args['default_content'] ) ) : ?>
-				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo $rand; ?>" class="button thickbox getpaid-page-setting-view-default"><?php _e( 'View Default Content', 'invoicing' ) ?></a>
+			<?php if (substr($args['id'], -5) === '_page' && !empty($args['default_content'])) : ?>
+				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo $rand; ?>" class="button thickbox getpaid-page-setting-view-default"><?php _e('View Default Content', 'invoicing') ?></a>
 				<div id='<?php echo $rand; ?>' style='display:none;'>
 					<div>
-						<h3><?php _e( 'Original Content', 'invoicing' ) ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo gepaid_trim_lines( wp_kses_post( $args['default_content'] ) ); ?></textarea>
-						<h3><?php _e( 'Current Content', 'invoicing' ) ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post( $value ); echo empty( $_post ) ? '' : gepaid_trim_lines( wp_kses_post( $_post->post_content ) ); ?></textarea>
+						<h3><?php _e('Original Content', 'invoicing') ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo gepaid_trim_lines(wp_kses_post($args['default_content'])); ?></textarea>
+						<h3><?php _e('Current Content', 'invoicing') ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post($value); echo empty($_post) ? '' : gepaid_trim_lines(wp_kses_post($_post->post_content)); ?></textarea>
 					</div>
 				</div>
 			<?php endif; ?>
@@ -791,88 +791,88 @@ 
 
 }
 
-function wpinv_color_select_callback( $args ) {
+function wpinv_color_select_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+	foreach ($args['options'] as $option => $color) {
+		$selected = selected($option, $value, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($color['label']) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_rich_editor_callback( $args ) {
+function wpinv_rich_editor_callback($args) {
 	global $wp_version;
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 	
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+	if (!empty($args['allow_blank']) && empty($value)) {
 		$value = $std;
 	}
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+	$rows = isset($args['size']) ? $args['size'] : 20;
 
 	$html = '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+	if ($wp_version >= 3.3 && function_exists('wp_editor')) {
 		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+		wp_editor(stripslashes($value), 'wpinv_settings_' . esc_attr($args['id']), array('textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']', 'textarea_rows' => absint($rows), 'media_buttons' => false));
 		$html .= ob_get_clean();
 	} else {
-		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+		$html .= '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="wpi-' . esc_attr(sanitize_html_class($args['id'])) . '">' . esc_textarea(stripslashes($value)) . '</textarea>';
 	}
 
-	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '</div><br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_upload_callback( $args ) {
+function wpinv_upload_callback($args) {
     
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="text" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr(stripslashes($value)) . '"/>';
+	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __('Upload File', 'invoicing') . '"/></span>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
-function wpinv_color_callback( $args ) {
+function wpinv_color_callback($args) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+	$std         = isset($args['std']) ? $args['std'] : '';
+	$value       = wpinv_get_option($args['id'], $std);
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '" data-default-color="' . esc_attr($std) . '" />';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
 
 function wpinv_country_states_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
@@ -880,16 +880,16 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$class = empty($states) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"' . $class . 'data-placeholder="' . esc_html($placeholder) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+	foreach ($states as $option => $name) {
+		$selected = selected($option, $value, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($name) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 	echo $html;
 }
@@ -904,7 +904,7 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-tax-rates-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-tax-rates-edit.php'; ?>
 
 	<?php
 
@@ -913,14 +913,14 @@ 
 /**
  * Displays a tax rate' edit row.
  */
-function wpinv_tax_rate_callback( $tax_rate, $key, $echo = true ) {
+function wpinv_tax_rate_callback($tax_rate, $key, $echo = true) {
 	ob_start();
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+	$key                      = sanitize_key($key);
+	$tax_rate['reduced_rate'] = empty($tax_rate['reduced_rate']) ? 0 : $tax_rate['reduced_rate'];
+	include plugin_dir_path(__FILE__) . 'views/html-tax-rate-edit.php';
 
-	if ( $echo ) {
+	if ($echo) {
 		echo ob_get_clean();
 	} else {
 		return ob_get_clean(); 
@@ -933,136 +933,136 @@ 
     ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tools_tdbox">
-    <?php if ( $args['desc'] ) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
-    <?php do_action( 'wpinv_tools_before' ); ?>
+    <?php if ($args['desc']) { ?><p><?php echo $args['desc']; ?></p><?php } ?>
+    <?php do_action('wpinv_tools_before'); ?>
     <table id="wpinv_tools_table" class="wp-list-table widefat fixed posts">
         <thead>
             <tr>
-                <th scope="col" class="wpinv-th-tool"><?php _e( 'Tool', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-desc"><?php _e( 'Description', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-action"><?php _e( 'Action', 'invoicing' ); ?></th>
+                <th scope="col" class="wpinv-th-tool"><?php _e('Tool', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-desc"><?php _e('Description', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-action"><?php _e('Action', 'invoicing'); ?></th>
             </tr>
         </thead>
 
         <tbody>
 			<tr>
-                <td><?php _e( 'Check Pages', 'invoicing' );?></td>
+                <td><?php _e('Check Pages', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Creates any missing GetPaid pages.', 'invoicing' ); ?></small>
+                    <small><?php _e('Creates any missing GetPaid pages.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php _e( 'Create Database Tables', 'invoicing' );?></td>
+                <td><?php _e('Create Database Tables', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Run this tool to create any missing database tables.', 'invoicing' ); ?></small>
+                    <small><?php _e('Run this tool to create any missing database tables.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_tables'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php _e( 'Migrate old invoices', 'invoicing' );?></td>
+                <td><?php _e('Migrate old invoices', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing' ); ?></small>
+                    <small><?php _e('If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+								add_query_arg('getpaid-admin-action', 'migrate_old_invoices'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e('Run', 'invoicing');?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php _e( 'Recalculate Discounts', 'invoicing' );?></td>
+                <td><?php _e('Recalculate Discounts', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing' ); ?></small>
+                    <small><?php _e('Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+								add_query_arg('getpaid-admin-action', 'recalculate_discounts'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
-					?>" class="button button-primary"><?php _e( 'Run', 'invoicing' );?></a>
+					?>" class="button button-primary"><?php _e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php _e( 'Set-up Wizard', 'invoicing' );?></td>
+                <td><?php _e('Set-up Wizard', 'invoicing'); ?></td>
                 <td>
-                    <small><?php _e( 'Launch the quick set-up wizard.', 'invoicing' ); ?></small>
+                    <small><?php _e('Launch the quick set-up wizard.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="<?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
-					?>" class="button button-primary"><?php _e( 'Launch', 'invoicing' );?></a>
+						echo esc_url(admin_url('index.php?page=gp-setup'));
+					?>" class="button button-primary"><?php _e('Launch', 'invoicing'); ?></a>
                 </td>
             </tr>
 
-			<?php do_action( 'wpinv_tools_row' ); ?>
+			<?php do_action('wpinv_tools_row'); ?>
         </tbody>
     </table>
-    <?php do_action( 'wpinv_tools_after' ); ?>
+    <?php do_action('wpinv_tools_after'); ?>
     <?php
     echo ob_get_clean();
 }
 
 
-function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+function wpinv_descriptive_text_callback($args) {
+	echo wp_kses_post($args['desc']);
 }
 
-function wpinv_raw_html_callback( $args ) {
+function wpinv_raw_html_callback($args) {
 	echo $args['desc'];
 }
 
-function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+function wpinv_hook_callback($args) {
+	do_action('wpinv_' . $args['id'], $args);
 }
 
 function wpinv_set_settings_cap() {
 	return wpinv_get_capability();
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = !empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = !empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
     
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
 
 /**
  * Returns the merge tags help text.
@@ -1071,16 +1071,16 @@ 
  * 
  * @return string
  */
-function wpinv_get_merge_tags_help_text( $subscription = false ) {
+function wpinv_get_merge_tags_help_text($subscription = false) {
 
 	$url  = $subscription ? 'https://gist.github.com/picocodes/3d213982d57c34edf7a46fd3f0e8583e' : 'https://gist.github.com/picocodes/43bdc4d4bbba844534b2722e2af0b58f';
 	$link = sprintf(
 		'<strong><a href="%s" target="_blank">%s</a></strong>',
 		$url,
-		esc_html__( 'View available merge tags.', 'wpinv-quotes' )
+		esc_html__('View available merge tags.', 'wpinv-quotes')
 	);
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+	$description = esc_html__('The content of the email (Merge Tags and HTML are allowed).', 'invoicing');
 
 	return "$description $link";
 

includes/class-getpaid-post-types.php

Indentation +295 added lines, -295 removed lines

@@ -15,321 +15,321 @@
 class GetPaid_Post_Types {
 
     /**
-	 * Hook in methods.
-	 */
-	public function __construct() {
-		add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
-		add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
-		add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
-		add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
-	}
+     * Hook in methods.
+     */
+    public function __construct() {
+        add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
+        add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
+        add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
+        add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
+    }
 
-	/**
-	 * Register core post types.
-	 */
-	public static function register_post_types() {
+    /**
+     * Register core post types.
+     */
+    public static function register_post_types() {
 
-		if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
-			return;
-		}
+        if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
+            return;
+        }
 
-		$capabilities = wpinv_current_user_can_manage_invoicing();
+        $capabilities = wpinv_current_user_can_manage_invoicing();
 
-		// Fires before registering post types.
-		do_action( 'getpaid_register_post_types' );
+        // Fires before registering post types.
+        do_action( 'getpaid_register_post_types' );
 
-		// Register item post type.
-		register_post_type(
-			'wpi_item',
-			apply_filters(
-				'wpinv_register_post_type_invoice_item',
-				array(
-					'labels'             => array(
-						'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-						'new_item'           => __( 'New Item', 'invoicing' ),
-						'edit_item'          => __( 'Edit Item', 'invoicing' ),
-						'view_item'          => __( 'View Item', 'invoicing' ),
-						'all_items'          => __( 'Items', 'invoicing' ),
-						'search_items'       => __( 'Search items', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
-						'not_found'          => __( 'No items found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
-					),
-					'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
-					'public'                => false,
-					'has_archive'           => false,
-					'_builtin'              => false,
-					'show_ui'               => true,
-					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'excerpt', 'thumbnail' ),
-					'rewrite'               => false,
-					'query_var'             => false,
-					'map_meta_cap'          => true,
-					'show_in_admin_bar'     => true,
-					'can_export'            => true,
-				)
-			)
-		);
+        // Register item post type.
+        register_post_type(
+            'wpi_item',
+            apply_filters(
+                'wpinv_register_post_type_invoice_item',
+                array(
+                    'labels'             => array(
+                        'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
+                        'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
+                        'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
+                        'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
+                        'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
+                        'add_new_item'       => __( 'Add New Item', 'invoicing' ),
+                        'new_item'           => __( 'New Item', 'invoicing' ),
+                        'edit_item'          => __( 'Edit Item', 'invoicing' ),
+                        'view_item'          => __( 'View Item', 'invoicing' ),
+                        'all_items'          => __( 'Items', 'invoicing' ),
+                        'search_items'       => __( 'Search items', 'invoicing' ),
+                        'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
+                        'not_found'          => __( 'No items found.', 'invoicing' ),
+                        'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
+                    ),
+                    'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
+                    'public'                => false,
+                    'has_archive'           => false,
+                    '_builtin'              => false,
+                    'show_ui'               => true,
+                    'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'show_in_nav_menus'     => false,
+                    'supports'              => array( 'title', 'excerpt', 'thumbnail' ),
+                    'rewrite'               => false,
+                    'query_var'             => false,
+                    'map_meta_cap'          => true,
+                    'show_in_admin_bar'     => true,
+                    'can_export'            => true,
+                )
+            )
+        );
 
-		// Register payment form post type.
-		register_post_type(
-			'wpi_payment_form',
-			apply_filters(
-				'wpinv_register_post_type_payment_form',
-				array(
-					'labels'             => array(
-						'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
-						'new_item'           => __( 'New Payment Form', 'invoicing' ),
-						'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
-						'view_item'          => __( 'View Payment Form', 'invoicing' ),
-						'all_items'          => __( 'Payment Forms', 'invoicing' ),
-						'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
-						'not_found'          => __( 'No payment forms found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
-					),
-					'description'        => __( 'Add new payment forms.', 'invoicing' ),
-					'public'             => false,
-					'show_ui'            => true,
-					'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'show_in_nav_menus'  => false,
-					'query_var'          => false,
-					'rewrite'            => true,
-					'map_meta_cap'       => true,
-					'has_archive'        => false,
-					'hierarchical'       => false,
-					'menu_position'      => null,
-					'supports'           => array( 'title' ),
-					'menu_icon'          => 'dashicons-media-form',
-				)
-			)
-		);
+        // Register payment form post type.
+        register_post_type(
+            'wpi_payment_form',
+            apply_filters(
+                'wpinv_register_post_type_payment_form',
+                array(
+                    'labels'             => array(
+                        'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
+                        'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
+                        'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
+                        'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
+                        'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
+                        'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
+                        'new_item'           => __( 'New Payment Form', 'invoicing' ),
+                        'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
+                        'view_item'          => __( 'View Payment Form', 'invoicing' ),
+                        'all_items'          => __( 'Payment Forms', 'invoicing' ),
+                        'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
+                        'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
+                        'not_found'          => __( 'No payment forms found.', 'invoicing' ),
+                        'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
+                    ),
+                    'description'        => __( 'Add new payment forms.', 'invoicing' ),
+                    'public'             => false,
+                    'show_ui'            => true,
+                    'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'show_in_nav_menus'  => false,
+                    'query_var'          => false,
+                    'rewrite'            => true,
+                    'map_meta_cap'       => true,
+                    'has_archive'        => false,
+                    'hierarchical'       => false,
+                    'menu_position'      => null,
+                    'supports'           => array( 'title' ),
+                    'menu_icon'          => 'dashicons-media-form',
+                )
+            )
+        );
 
-		// Register invoice post type.
-		register_post_type(
-			'wpi_invoice',
-			apply_filters(
-				'wpinv_register_post_type_invoice',
-				array(
-					'labels'                 => array(
-						'name'                  => __( 'Invoices', 'invoicing' ),
-						'singular_name'         => __( 'Invoice', 'invoicing' ),
-						'all_items'             => __( 'Invoices', 'invoicing' ),
-						'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit invoice', 'invoicing' ),
-						'new_item'              => __( 'New invoice', 'invoicing' ),
-						'view_item'             => __( 'View invoice', 'invoicing' ),
-						'view_items'            => __( 'View Invoices', 'invoicing' ),
-						'search_items'          => __( 'Search invoices', 'invoicing' ),
-						'not_found'             => __( 'No invoices found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent invoice', 'invoicing' ),
-						'featured_image'        => __( 'Invoice image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
-						'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
-						'items_list'            => __( 'Invoices list', 'invoicing' ),
-					),
-					'description'           => __( 'This is where invoices are stored.', 'invoicing' ),
-					'public'                => true,
-					'has_archive'           => false,
-					'publicly_queryable'    => true,
-        			'exclude_from_search'   => true,
-        			'show_ui'               => true,
-					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'author', 'excerpt'  ),
-					'rewrite'               => array(
-						'slug'              => 'invoice',
-						'with_front'        => false,
-					),
-					'query_var'             => false,
-					'map_meta_cap'          => true,
-					'show_in_admin_bar'     => true,
-					'can_export'            => true,
-					'hierarchical'          => false,
-					'menu_position'         => null,
-					'menu_icon'             => 'dashicons-media-spreadsheet',
-				)
-			)
-		);
+        // Register invoice post type.
+        register_post_type(
+            'wpi_invoice',
+            apply_filters(
+                'wpinv_register_post_type_invoice',
+                array(
+                    'labels'                 => array(
+                        'name'                  => __( 'Invoices', 'invoicing' ),
+                        'singular_name'         => __( 'Invoice', 'invoicing' ),
+                        'all_items'             => __( 'Invoices', 'invoicing' ),
+                        'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
+                        'add_new'               => __( 'Add New', 'invoicing' ),
+                        'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
+                        'edit'                  => __( 'Edit', 'invoicing' ),
+                        'edit_item'             => __( 'Edit invoice', 'invoicing' ),
+                        'new_item'              => __( 'New invoice', 'invoicing' ),
+                        'view_item'             => __( 'View invoice', 'invoicing' ),
+                        'view_items'            => __( 'View Invoices', 'invoicing' ),
+                        'search_items'          => __( 'Search invoices', 'invoicing' ),
+                        'not_found'             => __( 'No invoices found', 'invoicing' ),
+                        'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
+                        'parent'                => __( 'Parent invoice', 'invoicing' ),
+                        'featured_image'        => __( 'Invoice image', 'invoicing' ),
+                        'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
+                        'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
+                        'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
+                        'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
+                        'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
+                        'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
+                        'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
+                        'items_list'            => __( 'Invoices list', 'invoicing' ),
+                    ),
+                    'description'           => __( 'This is where invoices are stored.', 'invoicing' ),
+                    'public'                => true,
+                    'has_archive'           => false,
+                    'publicly_queryable'    => true,
+                    'exclude_from_search'   => true,
+                    'show_ui'               => true,
+                    'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'show_in_nav_menus'     => false,
+                    'supports'              => array( 'title', 'author', 'excerpt'  ),
+                    'rewrite'               => array(
+                        'slug'              => 'invoice',
+                        'with_front'        => false,
+                    ),
+                    'query_var'             => false,
+                    'map_meta_cap'          => true,
+                    'show_in_admin_bar'     => true,
+                    'can_export'            => true,
+                    'hierarchical'          => false,
+                    'menu_position'         => null,
+                    'menu_icon'             => 'dashicons-media-spreadsheet',
+                )
+            )
+        );
 
-		// Register discount post type.
-		register_post_type(
-			'wpi_discount',
-			apply_filters(
-				'wpinv_register_post_type_discount',
-				array(
-					'labels'                 => array(
-						'name'                  => __( 'Discounts', 'invoicing' ),
-						'singular_name'         => __( 'Discount', 'invoicing' ),
-						'all_items'             => __( 'Discounts', 'invoicing' ),
-						'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new discount', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit discount', 'invoicing' ),
-						'new_item'              => __( 'New discount', 'invoicing' ),
-						'view_item'             => __( 'View discount', 'invoicing' ),
-						'view_items'            => __( 'View Discounts', 'invoicing' ),
-						'search_items'          => __( 'Search discounts', 'invoicing' ),
-						'not_found'             => __( 'No discounts found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent discount', 'invoicing' ),
-						'featured_image'        => __( 'Discount image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
-						'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
-						'items_list'            => __( 'Discounts list', 'invoicing' ),
-					),
-					'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
-					'public'             => false,
-					'can_export'         => true,
-					'_builtin'           => false,
-					'publicly_queryable' => false,
-					'exclude_from_search'=> true,
-					'show_ui'            => true,
-					'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'query_var'          => false,
-					'rewrite'            => false,
-					'map_meta_cap'       => true,
-					'has_archive'        => false,
-					'hierarchical'       => false,
-					'supports'           => array( 'title', 'excerpt' ),
-					'show_in_nav_menus'  => false,
-					'show_in_admin_bar'  => true,
-					'menu_position'      => null,
-				)
-			)
-		);
+        // Register discount post type.
+        register_post_type(
+            'wpi_discount',
+            apply_filters(
+                'wpinv_register_post_type_discount',
+                array(
+                    'labels'                 => array(
+                        'name'                  => __( 'Discounts', 'invoicing' ),
+                        'singular_name'         => __( 'Discount', 'invoicing' ),
+                        'all_items'             => __( 'Discounts', 'invoicing' ),
+                        'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
+                        'add_new'               => __( 'Add New', 'invoicing' ),
+                        'add_new_item'          => __( 'Add new discount', 'invoicing' ),
+                        'edit'                  => __( 'Edit', 'invoicing' ),
+                        'edit_item'             => __( 'Edit discount', 'invoicing' ),
+                        'new_item'              => __( 'New discount', 'invoicing' ),
+                        'view_item'             => __( 'View discount', 'invoicing' ),
+                        'view_items'            => __( 'View Discounts', 'invoicing' ),
+                        'search_items'          => __( 'Search discounts', 'invoicing' ),
+                        'not_found'             => __( 'No discounts found', 'invoicing' ),
+                        'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
+                        'parent'                => __( 'Parent discount', 'invoicing' ),
+                        'featured_image'        => __( 'Discount image', 'invoicing' ),
+                        'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
+                        'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
+                        'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
+                        'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
+                        'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
+                        'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
+                        'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
+                        'items_list'            => __( 'Discounts list', 'invoicing' ),
+                    ),
+                    'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+                    'public'             => false,
+                    'can_export'         => true,
+                    '_builtin'           => false,
+                    'publicly_queryable' => false,
+                    'exclude_from_search'=> true,
+                    'show_ui'            => true,
+                    'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'query_var'          => false,
+                    'rewrite'            => false,
+                    'map_meta_cap'       => true,
+                    'has_archive'        => false,
+                    'hierarchical'       => false,
+                    'supports'           => array( 'title', 'excerpt' ),
+                    'show_in_nav_menus'  => false,
+                    'show_in_admin_bar'  => true,
+                    'menu_position'      => null,
+                )
+            )
+        );
 
-		do_action( 'getpaid_after_register_post_types' );
-	}
+        do_action( 'getpaid_after_register_post_types' );
+    }
 
-	/**
-	 * Register our custom post statuses.
-	 */
-	public static function register_post_status() {
+    /**
+     * Register our custom post statuses.
+     */
+    public static function register_post_status() {
 
-		$invoice_statuses = apply_filters(
-			'getpaid_register_invoice_post_statuses',
-			array(
+        $invoice_statuses = apply_filters(
+            'getpaid_register_invoice_post_statuses',
+            array(
 
-				'wpi-pending' => array(
-					'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-pending' => array(
+                    'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-processing' => array(
-					'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-processing' => array(
+                    'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-onhold' => array(
-					'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-onhold' => array(
+                    'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-cancelled' => array(
-					'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-cancelled' => array(
+                    'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-refunded' => array(
-					'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-refunded' => array(
+                    'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-failed' => array(
-					'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-failed' => array(
+                    'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-renewal' => array(
-					'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
-				)
-			)
-		);
+                'wpi-renewal' => array(
+                    'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
+                )
+            )
+        );
 
-		foreach ( $invoice_statuses as $invoice_statuse => $args ) {
-			register_post_status( $invoice_statuse, $args );
-		}
-	}
+        foreach ( $invoice_statuses as $invoice_statuse => $args ) {
+            register_post_status( $invoice_statuse, $args );
+        }
+    }
 
-	/**
-	 * Flush rewrite rules.
-	 */
-	public static function flush_rewrite_rules() {
-		flush_rewrite_rules();
-	}
+    /**
+     * Flush rewrite rules.
+     */
+    public static function flush_rewrite_rules() {
+        flush_rewrite_rules();
+    }
 
-	/**
-	 * Flush rules to prevent 404.
-	 *
-	 */
-	public static function maybe_flush_rewrite_rules() {
-		if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
-			update_option( 'getpaid_flushed_rewrite_rules', '1' );
-			self::flush_rewrite_rules();
-		}
-	}
+    /**
+     * Flush rules to prevent 404.
+     *
+     */
+    public static function maybe_flush_rewrite_rules() {
+        if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
+            update_option( 'getpaid_flushed_rewrite_rules', '1' );
+            self::flush_rewrite_rules();
+        }
+    }
 
 }

Spacing +110 added lines, -110 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Post types Class
@@ -18,10 +18,10 @@ 
 	 * Hook in methods.
 	 */
 	public function __construct() {
-		add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
-		add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
-		add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
-		add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
+		add_action('init', array(__CLASS__, 'register_post_types'), 1);
+		add_action('init', array(__CLASS__, 'register_post_status'), 4);
+		add_action('getpaid_flush_rewrite_rules', array(__CLASS__, 'flush_rewrite_rules'));
+		add_action('getpaid_after_register_post_types', array(__CLASS__, 'maybe_flush_rewrite_rules'));
 	}
 
 	/**
@@ -29,14 +29,14 @@ 
 	 */
 	public static function register_post_types() {
 
-		if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
+		if (!is_blog_installed() || post_type_exists('wpi_item')) {
 			return;
 		}
 
 		$capabilities = wpinv_current_user_can_manage_invoicing();
 
 		// Fires before registering post types.
-		do_action( 'getpaid_register_post_types' );
+		do_action('getpaid_register_post_types');
 
 		// Register item post type.
 		register_post_type(
@@ -45,29 +45,29 @@ 
 				'wpinv_register_post_type_invoice_item',
 				array(
 					'labels'             => array(
-						'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-						'new_item'           => __( 'New Item', 'invoicing' ),
-						'edit_item'          => __( 'Edit Item', 'invoicing' ),
-						'view_item'          => __( 'View Item', 'invoicing' ),
-						'all_items'          => __( 'Items', 'invoicing' ),
-						'search_items'       => __( 'Search items', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
-						'not_found'          => __( 'No items found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
+						'name'               => _x('Items', 'post type general name', 'invoicing'),
+						'singular_name'      => _x('Item', 'post type singular name', 'invoicing'),
+						'menu_name'          => _x('Items', 'admin menu', 'invoicing'),
+						'name_admin_bar'     => _x('Item', 'add new on admin bar', 'invoicing'),
+						'add_new'            => _x('Add New', 'Item', 'invoicing'),
+						'add_new_item'       => __('Add New Item', 'invoicing'),
+						'new_item'           => __('New Item', 'invoicing'),
+						'edit_item'          => __('Edit Item', 'invoicing'),
+						'view_item'          => __('View Item', 'invoicing'),
+						'all_items'          => __('Items', 'invoicing'),
+						'search_items'       => __('Search items', 'invoicing'),
+						'parent_item_colon'  => __('Parent item:', 'invoicing'),
+						'not_found'          => __('No items found.', 'invoicing'),
+						'not_found_in_trash' => __('No items found in trash.', 'invoicing')
 					),
-					'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
+					'description'           => __('This is where you can add new invoice items.', 'invoicing'),
 					'public'                => false,
 					'has_archive'           => false,
 					'_builtin'              => false,
 					'show_ui'               => true,
 					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
 					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'excerpt', 'thumbnail' ),
+					'supports'              => array('title', 'excerpt', 'thumbnail'),
 					'rewrite'               => false,
 					'query_var'             => false,
 					'map_meta_cap'          => true,
@@ -84,22 +84,22 @@ 
 				'wpinv_register_post_type_payment_form',
 				array(
 					'labels'             => array(
-						'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
-						'new_item'           => __( 'New Payment Form', 'invoicing' ),
-						'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
-						'view_item'          => __( 'View Payment Form', 'invoicing' ),
-						'all_items'          => __( 'Payment Forms', 'invoicing' ),
-						'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
-						'not_found'          => __( 'No payment forms found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
+						'name'               => _x('Payment Forms', 'post type general name', 'invoicing'),
+						'singular_name'      => _x('Payment Form', 'post type singular name', 'invoicing'),
+						'menu_name'          => _x('Payment Forms', 'admin menu', 'invoicing'),
+						'name_admin_bar'     => _x('Payment Form', 'add new on admin bar', 'invoicing'),
+						'add_new'            => _x('Add New', 'Payment Form', 'invoicing'),
+						'add_new_item'       => __('Add New Payment Form', 'invoicing'),
+						'new_item'           => __('New Payment Form', 'invoicing'),
+						'edit_item'          => __('Edit Payment Form', 'invoicing'),
+						'view_item'          => __('View Payment Form', 'invoicing'),
+						'all_items'          => __('Payment Forms', 'invoicing'),
+						'search_items'       => __('Search Payment Forms', 'invoicing'),
+						'parent_item_colon'  => __('Parent Payment Forms:', 'invoicing'),
+						'not_found'          => __('No payment forms found.', 'invoicing'),
+						'not_found_in_trash' => __('No payment forms found in trash.', 'invoicing')
 					),
-					'description'        => __( 'Add new payment forms.', 'invoicing' ),
+					'description'        => __('Add new payment forms.', 'invoicing'),
 					'public'             => false,
 					'show_ui'            => true,
 					'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
@@ -110,7 +110,7 @@ 
 					'has_archive'        => false,
 					'hierarchical'       => false,
 					'menu_position'      => null,
-					'supports'           => array( 'title' ),
+					'supports'           => array('title'),
 					'menu_icon'          => 'dashicons-media-form',
 				)
 			)
@@ -123,32 +123,32 @@ 
 				'wpinv_register_post_type_invoice',
 				array(
 					'labels'                 => array(
-						'name'                  => __( 'Invoices', 'invoicing' ),
-						'singular_name'         => __( 'Invoice', 'invoicing' ),
-						'all_items'             => __( 'Invoices', 'invoicing' ),
-						'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit invoice', 'invoicing' ),
-						'new_item'              => __( 'New invoice', 'invoicing' ),
-						'view_item'             => __( 'View invoice', 'invoicing' ),
-						'view_items'            => __( 'View Invoices', 'invoicing' ),
-						'search_items'          => __( 'Search invoices', 'invoicing' ),
-						'not_found'             => __( 'No invoices found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent invoice', 'invoicing' ),
-						'featured_image'        => __( 'Invoice image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
-						'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
-						'items_list'            => __( 'Invoices list', 'invoicing' ),
+						'name'                  => __('Invoices', 'invoicing'),
+						'singular_name'         => __('Invoice', 'invoicing'),
+						'all_items'             => __('Invoices', 'invoicing'),
+						'menu_name'             => _x('Invoices', 'Admin menu name', 'invoicing'),
+						'add_new'               => __('Add New', 'invoicing'),
+						'add_new_item'          => __('Add new invoice', 'invoicing'),
+						'edit'                  => __('Edit', 'invoicing'),
+						'edit_item'             => __('Edit invoice', 'invoicing'),
+						'new_item'              => __('New invoice', 'invoicing'),
+						'view_item'             => __('View invoice', 'invoicing'),
+						'view_items'            => __('View Invoices', 'invoicing'),
+						'search_items'          => __('Search invoices', 'invoicing'),
+						'not_found'             => __('No invoices found', 'invoicing'),
+						'not_found_in_trash'    => __('No invoices found in trash', 'invoicing'),
+						'parent'                => __('Parent invoice', 'invoicing'),
+						'featured_image'        => __('Invoice image', 'invoicing'),
+						'set_featured_image'    => __('Set invoice image', 'invoicing'),
+						'remove_featured_image' => __('Remove invoice image', 'invoicing'),
+						'use_featured_image'    => __('Use as invoice image', 'invoicing'),
+						'insert_into_item'      => __('Insert into invoice', 'invoicing'),
+						'uploaded_to_this_item' => __('Uploaded to this invoice', 'invoicing'),
+						'filter_items_list'     => __('Filter invoices', 'invoicing'),
+						'items_list_navigation' => __('Invoices navigation', 'invoicing'),
+						'items_list'            => __('Invoices list', 'invoicing'),
 					),
-					'description'           => __( 'This is where invoices are stored.', 'invoicing' ),
+					'description'           => __('This is where invoices are stored.', 'invoicing'),
 					'public'                => true,
 					'has_archive'           => false,
 					'publicly_queryable'    => true,
@@ -156,7 +156,7 @@ 
         			'show_ui'               => true,
 					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
 					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'author', 'excerpt'  ),
+					'supports'              => array('title', 'author', 'excerpt'),
 					'rewrite'               => array(
 						'slug'              => 'invoice',
 						'with_front'        => false,
@@ -179,32 +179,32 @@ 
 				'wpinv_register_post_type_discount',
 				array(
 					'labels'                 => array(
-						'name'                  => __( 'Discounts', 'invoicing' ),
-						'singular_name'         => __( 'Discount', 'invoicing' ),
-						'all_items'             => __( 'Discounts', 'invoicing' ),
-						'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new discount', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit discount', 'invoicing' ),
-						'new_item'              => __( 'New discount', 'invoicing' ),
-						'view_item'             => __( 'View discount', 'invoicing' ),
-						'view_items'            => __( 'View Discounts', 'invoicing' ),
-						'search_items'          => __( 'Search discounts', 'invoicing' ),
-						'not_found'             => __( 'No discounts found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent discount', 'invoicing' ),
-						'featured_image'        => __( 'Discount image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
-						'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
-						'items_list'            => __( 'Discounts list', 'invoicing' ),
+						'name'                  => __('Discounts', 'invoicing'),
+						'singular_name'         => __('Discount', 'invoicing'),
+						'all_items'             => __('Discounts', 'invoicing'),
+						'menu_name'             => _x('Discounts', 'Admin menu name', 'invoicing'),
+						'add_new'               => __('Add New', 'invoicing'),
+						'add_new_item'          => __('Add new discount', 'invoicing'),
+						'edit'                  => __('Edit', 'invoicing'),
+						'edit_item'             => __('Edit discount', 'invoicing'),
+						'new_item'              => __('New discount', 'invoicing'),
+						'view_item'             => __('View discount', 'invoicing'),
+						'view_items'            => __('View Discounts', 'invoicing'),
+						'search_items'          => __('Search discounts', 'invoicing'),
+						'not_found'             => __('No discounts found', 'invoicing'),
+						'not_found_in_trash'    => __('No discounts found in trash', 'invoicing'),
+						'parent'                => __('Parent discount', 'invoicing'),
+						'featured_image'        => __('Discount image', 'invoicing'),
+						'set_featured_image'    => __('Set discount image', 'invoicing'),
+						'remove_featured_image' => __('Remove discount image', 'invoicing'),
+						'use_featured_image'    => __('Use as discount image', 'invoicing'),
+						'insert_into_item'      => __('Insert into discount', 'invoicing'),
+						'uploaded_to_this_item' => __('Uploaded to this discount', 'invoicing'),
+						'filter_items_list'     => __('Filter discounts', 'invoicing'),
+						'items_list_navigation' => __('Discount navigation', 'invoicing'),
+						'items_list'            => __('Discounts list', 'invoicing'),
 					),
-					'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+					'description'        => __('This is where you can add new discounts that users can use in invoices.', 'invoicing'),
 					'public'             => false,
 					'can_export'         => true,
 					'_builtin'           => false,
@@ -217,7 +217,7 @@ 
 					'map_meta_cap'       => true,
 					'has_archive'        => false,
 					'hierarchical'       => false,
-					'supports'           => array( 'title', 'excerpt' ),
+					'supports'           => array('title', 'excerpt'),
 					'show_in_nav_menus'  => false,
 					'show_in_admin_bar'  => true,
 					'menu_position'      => null,
@@ -225,7 +225,7 @@ 
 			)
 		);
 
-		do_action( 'getpaid_after_register_post_types' );
+		do_action('getpaid_after_register_post_types');
 	}
 
 	/**
@@ -238,79 +238,79 @@ 
 			array(
 
 				'wpi-pending' => array(
-					'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Pending Payment', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-processing' => array(
-					'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Processing', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-onhold' => array(
-					'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('On Hold', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-cancelled' => array(
-					'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Cancelled', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-refunded' => array(
-					'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Refunded', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-failed' => array(
-					'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Failed', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing')
 				),
 
 				'wpi-renewal' => array(
-					'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Renewal', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
+        			'label_count'               => _n_noop('Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing')
 				)
 			)
 		);
 
-		foreach ( $invoice_statuses as $invoice_statuse => $args ) {
-			register_post_status( $invoice_statuse, $args );
+		foreach ($invoice_statuses as $invoice_statuse => $args) {
+			register_post_status($invoice_statuse, $args);
 		}
 	}
 
@@ -326,8 +326,8 @@ 
 	 *
 	 */
 	public static function maybe_flush_rewrite_rules() {
-		if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
-			update_option( 'getpaid_flushed_rewrite_rules', '1' );
+		if (!get_option('getpaid_flushed_rewrite_rules')) {
+			update_option('getpaid_flushed_rewrite_rules', '1');
 			self::flush_rewrite_rules();
 		}
 	}