AyeCode / invoicing

includes/admin/admin-meta-boxes.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high' );
     }
 
-	remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
+    remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
 }
 add_action( 'add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2 );
 

Spacing +145 added lines, -145 removed lines

@@ -1,129 +1,129 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_add_meta_boxes( $post_type, $post ) {
+function wpinv_add_meta_boxes($post_type, $post) {
     global $wpi_mb_invoice;
-    if ( $post_type == 'wpi_invoice' && !empty( $post->ID ) ) {
-        $wpi_mb_invoice = wpinv_get_invoice( $post->ID );
+    if ($post_type == 'wpi_invoice' && !empty($post->ID)) {
+        $wpi_mb_invoice = wpinv_get_invoice($post->ID);
     }
     
-    if ( !empty( $wpi_mb_invoice ) && !$wpi_mb_invoice->has_status( array( 'draft', 'auto-draft' ) ) ) {
-        add_meta_box( 'wpinv-mb-resend-invoice', __( 'Resend Invoice', 'invoicing' ), 'WPInv_Meta_Box_Details::resend_invoice', 'wpi_invoice', 'side', 'high' );
+    if (!empty($wpi_mb_invoice) && !$wpi_mb_invoice->has_status(array('draft', 'auto-draft'))) {
+        add_meta_box('wpinv-mb-resend-invoice', __('Resend Invoice', 'invoicing'), 'WPInv_Meta_Box_Details::resend_invoice', 'wpi_invoice', 'side', 'high');
     }
     
-    if ( !empty( $wpi_mb_invoice ) && $wpi_mb_invoice->is_recurring() && $wpi_mb_invoice->is_parent() ) {
-        add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscriptions', 'invoicing' ), 'WPInv_Meta_Box_Details::subscriptions', 'wpi_invoice', 'side', 'high' );
+    if (!empty($wpi_mb_invoice) && $wpi_mb_invoice->is_recurring() && $wpi_mb_invoice->is_parent()) {
+        add_meta_box('wpinv-mb-subscriptions', __('Subscriptions', 'invoicing'), 'WPInv_Meta_Box_Details::subscriptions', 'wpi_invoice', 'side', 'high');
     }
     
-    if ( wpinv_is_subscription_payment( $wpi_mb_invoice ) ) {
-        add_meta_box( 'wpinv-mb-renewals', __( 'Renewal Payment', 'invoicing' ), 'WPInv_Meta_Box_Details::renewals', 'wpi_invoice', 'side', 'high' );
+    if (wpinv_is_subscription_payment($wpi_mb_invoice)) {
+        add_meta_box('wpinv-mb-renewals', __('Renewal Payment', 'invoicing'), 'WPInv_Meta_Box_Details::renewals', 'wpi_invoice', 'side', 'high');
     }
     
-    add_meta_box( 'wpinv-details', __( 'Invoice Details', 'invoicing' ), 'WPInv_Meta_Box_Details::output', 'wpi_invoice', 'side', 'default' );
-    add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'WPInv_Meta_Box_Details::payment_meta', 'wpi_invoice', 'side', 'default' );
+    add_meta_box('wpinv-details', __('Invoice Details', 'invoicing'), 'WPInv_Meta_Box_Details::output', 'wpi_invoice', 'side', 'default');
+    add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'WPInv_Meta_Box_Details::payment_meta', 'wpi_invoice', 'side', 'default');
 
-    add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
-    add_meta_box( 'wpinv-payment-form-shortcode', __( 'Shortcode', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_shortcode', 'wpi_payment_form', 'side' );
+    add_meta_box('wpinv-payment-form-design', __('Payment Form', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal');
+    add_meta_box('wpinv-payment-form-shortcode', __('Shortcode', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_shortcode', 'wpi_payment_form', 'side');
    
-    add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'WPInv_Meta_Box_Billing_Details::output', 'wpi_invoice', 'normal', 'high' );
-    add_meta_box( 'wpinv-items', __( 'Invoice Items', 'invoicing' ), 'WPInv_Meta_Box_Items::output', 'wpi_invoice', 'normal', 'high' );
-    add_meta_box( 'wpinv-notes', __( 'Invoice Notes', 'invoicing' ), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'normal', 'high' );
+    add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'WPInv_Meta_Box_Billing_Details::output', 'wpi_invoice', 'normal', 'high');
+    add_meta_box('wpinv-items', __('Invoice Items', 'invoicing'), 'WPInv_Meta_Box_Items::output', 'wpi_invoice', 'normal', 'high');
+    add_meta_box('wpinv-notes', __('Invoice Notes', 'invoicing'), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'normal', 'high');
     
-    if ( ! empty( $post->ID ) && get_post_meta( $post->ID, 'payment_form_data', true ) ) {
-        add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high' );
+    if (!empty($post->ID) && get_post_meta($post->ID, 'payment_form_data', true)) {
+        add_meta_box('wpinv-invoice-payment-form-details', __('Payment Form Details', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high');
     }
 
 	remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
 }
-add_action( 'add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2 );
+add_action('add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2);
 
-function wpinv_save_meta_boxes( $post_id, $post, $update = false ) {
-    remove_action( 'save_post', __FUNCTION__ );
+function wpinv_save_meta_boxes($post_id, $post, $update = false) {
+    remove_action('save_post', __FUNCTION__);
     
     // $post_id and $post are required
-    if ( empty( $post_id ) || empty( $post ) ) {
+    if (empty($post_id) || empty($post)) {
         return;
     }
         
-    if ( !current_user_can( 'edit_post', $post_id ) || empty( $post->post_type ) ) {
+    if (!current_user_can('edit_post', $post_id) || empty($post->post_type)) {
         return;
     }
     
     // Dont' save meta boxes for revisions or autosaves
-    if ( defined( 'DOING_AUTOSAVE' ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+    if (defined('DOING_AUTOSAVE') || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
         return;
     }
         
-    if ( $post->post_type == 'wpi_invoice' or $post->post_type == 'wpi_quote' ) {
-        if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+    if ($post->post_type == 'wpi_invoice' or $post->post_type == 'wpi_quote') {
+        if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
             return;
         }
     
-        if ( isset( $_POST['wpinv_save_invoice'] ) && wp_verify_nonce( $_POST['wpinv_save_invoice'], 'wpinv_save_invoice' ) ) {
-            WPInv_Meta_Box_Items::save( $post_id, $_POST, $post );
+        if (isset($_POST['wpinv_save_invoice']) && wp_verify_nonce($_POST['wpinv_save_invoice'], 'wpinv_save_invoice')) {
+            WPInv_Meta_Box_Items::save($post_id, $_POST, $post);
         }
-    } else if ( $post->post_type == 'wpi_item' ) {
-        GetPaid_Meta_Box_Item_Details::save( $post_id );
+    } else if ($post->post_type == 'wpi_item') {
+        GetPaid_Meta_Box_Item_Details::save($post_id);
     }
 }
-add_action( 'save_post', 'wpinv_save_meta_boxes', 10, 3 );
+add_action('save_post', 'wpinv_save_meta_boxes', 10, 3);
 
 function wpinv_register_item_meta_boxes() {    
     global $wpinv_euvat;
 
     // Registers the item details metabox.
-    add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+    add_meta_box('wpinv_item_details', __('Item Details', 'invoicing'), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high');
 
-    if ( $wpinv_euvat->allow_vat_rules() ) {
-        add_meta_box( 'wpinv_field_vat_rules', __( 'VAT rules type to use', 'invoicing' ), 'WPInv_Meta_Box_Items::vat_rules', 'wpi_item', 'normal', 'high' );
+    if ($wpinv_euvat->allow_vat_rules()) {
+        add_meta_box('wpinv_field_vat_rules', __('VAT rules type to use', 'invoicing'), 'WPInv_Meta_Box_Items::vat_rules', 'wpi_item', 'normal', 'high');
     }
     
-    if ( $wpinv_euvat->allow_vat_classes() ) {
-        add_meta_box( 'wpinv_field_vat_classes', __( 'VAT rates class to use', 'invoicing' ), 'WPInv_Meta_Box_Items::vat_classes', 'wpi_item', 'normal', 'high' );
+    if ($wpinv_euvat->allow_vat_classes()) {
+        add_meta_box('wpinv_field_vat_classes', __('VAT rates class to use', 'invoicing'), 'WPInv_Meta_Box_Items::vat_classes', 'wpi_item', 'normal', 'high');
     }
     
-    add_meta_box( 'wpinv_field_item_shortcode', __( 'Shortcode', 'invoicing' ), 'WPInv_Meta_Box_Items::shortcode', 'wpi_item', 'side', 'core' );
-    add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'WPInv_Meta_Box_Items::item_info', 'wpi_item', 'side', 'core' );
-    add_meta_box( 'wpinv_field_meta_values', __( 'Item Meta Values', 'invoicing' ), 'WPInv_Meta_Box_Items::meta_values', 'wpi_item', 'side', 'core' );
+    add_meta_box('wpinv_field_item_shortcode', __('Shortcode', 'invoicing'), 'WPInv_Meta_Box_Items::shortcode', 'wpi_item', 'side', 'core');
+    add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'WPInv_Meta_Box_Items::item_info', 'wpi_item', 'side', 'core');
+    add_meta_box('wpinv_field_meta_values', __('Item Meta Values', 'invoicing'), 'WPInv_Meta_Box_Items::meta_values', 'wpi_item', 'side', 'core');
 }
 
 function wpinv_register_discount_meta_boxes() {
-    add_meta_box( 'wpinv_discount_fields', __( 'Discount Details', 'invoicing' ), 'wpinv_discount_metabox_details', 'wpi_discount', 'normal', 'high' );
+    add_meta_box('wpinv_discount_fields', __('Discount Details', 'invoicing'), 'wpinv_discount_metabox_details', 'wpi_discount', 'normal', 'high');
 }
 
-function wpinv_discount_metabox_details( $post ) {
+function wpinv_discount_metabox_details($post) {
     $discount_id    = $post->ID;
-    $discount       = wpinv_get_discount( $discount_id );
+    $discount       = wpinv_get_discount($discount_id);
     
-    $type               = wpinv_get_discount_type( $discount_id );
-    $item_reqs          = wpinv_get_discount_item_reqs( $discount_id );
-    $excluded_items     = wpinv_get_discount_excluded_items( $discount_id );
-    $min_total          = wpinv_get_discount_min_total( $discount_id );
-    $max_total          = wpinv_get_discount_max_total( $discount_id );
-    $max_uses           = wpinv_get_discount_max_uses( $discount_id );
-    $single_use         = wpinv_discount_is_single_use( $discount_id );
-    $recurring          = (bool)wpinv_discount_is_recurring( $discount_id );
-    $start_date         = wpinv_get_discount_start_date( $discount_id );
-    $expiration_date    = wpinv_get_discount_expiration( $discount_id );
+    $type               = wpinv_get_discount_type($discount_id);
+    $item_reqs          = wpinv_get_discount_item_reqs($discount_id);
+    $excluded_items     = wpinv_get_discount_excluded_items($discount_id);
+    $min_total          = wpinv_get_discount_min_total($discount_id);
+    $max_total          = wpinv_get_discount_max_total($discount_id);
+    $max_uses           = wpinv_get_discount_max_uses($discount_id);
+    $single_use         = wpinv_discount_is_single_use($discount_id);
+    $recurring          = (bool) wpinv_discount_is_recurring($discount_id);
+    $start_date         = wpinv_get_discount_start_date($discount_id);
+    $expiration_date    = wpinv_get_discount_expiration($discount_id);
     
-    if ( ! empty( $start_date ) && strpos( $start_date, '0000' ) === false ) {
-        $start_time         = strtotime( $start_date );
-        $start_h            = date_i18n( 'H', $start_time );
-        $start_m            = date_i18n( 'i', $start_time );
-        $start_date         = date_i18n( 'Y-m-d', $start_time );
+    if (!empty($start_date) && strpos($start_date, '0000') === false) {
+        $start_time         = strtotime($start_date);
+        $start_h            = date_i18n('H', $start_time);
+        $start_m            = date_i18n('i', $start_time);
+        $start_date         = date_i18n('Y-m-d', $start_time);
     } else {
         $start_h            = '00';
         $start_m            = '00';
     }
 
-    if ( ! empty( $expiration_date ) && strpos( $expiration_date, '0000' ) === false ) {
-        $expiration_time    = strtotime( $expiration_date );
-        $expiration_h       = date_i18n( 'H', $expiration_time );
-        $expiration_m       = date_i18n( 'i', $expiration_time );
-        $expiration_date    = date_i18n( 'Y-m-d', $expiration_time );
+    if (!empty($expiration_date) && strpos($expiration_date, '0000') === false) {
+        $expiration_time    = strtotime($expiration_date);
+        $expiration_h       = date_i18n('H', $expiration_time);
+        $expiration_m       = date_i18n('i', $expiration_time);
+        $expiration_date    = date_i18n('Y-m-d', $expiration_time);
     } else {
         $expiration_h       = '23';
         $expiration_m       = '59';
@@ -133,220 +133,220 @@ 
     $max_total          = $max_total > 0 ? $max_total : '';
     $max_uses           = $max_uses > 0 ? $max_uses : '';
 ?>
-<?php do_action( 'wpinv_discount_form_top', $post ); ?>
-<?php wp_nonce_field( 'wpinv_discount_metabox_nonce', 'wpinv_discount_metabox_nonce' ); ;?>
+<?php do_action('wpinv_discount_form_top', $post); ?>
+<?php wp_nonce_field('wpinv_discount_metabox_nonce', 'wpinv_discount_metabox_nonce'); ;?>
 <table class="form-table wpi-form-table">
     <tbody>
-        <?php do_action( 'wpinv_discount_form_first', $post ); ?>
-        <?php do_action( 'wpinv_discount_form_before_code', $post ); ?>
+        <?php do_action('wpinv_discount_form_first', $post); ?>
+        <?php do_action('wpinv_discount_form_before_code', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_code"><?php _e( 'Discount Code', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_code"><?php _e('Discount Code', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" name="code" id="wpinv_discount_code" class="medium-text" value="<?php echo esc_attr( wpinv_get_discount_code( $discount_id ) ); ?>" required>
-                <p class="description"><?php _e( 'Enter a code for this discount, such as 10OFF', 'invoicing' ); ?></p>
+                <input type="text" name="code" id="wpinv_discount_code" class="medium-text" value="<?php echo esc_attr(wpinv_get_discount_code($discount_id)); ?>" required>
+                <p class="description"><?php _e('Enter a code for this discount, such as 10OFF', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_type', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_type', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_type"><?php _e( 'Discount Type', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_type"><?php _e('Discount Type', 'invoicing'); ?></label>
             </th>
             <td>
                 <select id="wpinv_discount_type" name="type" class="medium-text wpi_select2">
-                    <?php foreach ( wpinv_get_discount_types() as $value => $label ) { ?>
-                    <option value="<?php echo $value ;?>" <?php selected( $type, $value ); ?>><?php echo $label; ?></option>
+                    <?php foreach (wpinv_get_discount_types() as $value => $label) { ?>
+                    <option value="<?php echo $value; ?>" <?php selected($type, $value); ?>><?php echo $label; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'The kind of discount to apply for this discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('The kind of discount to apply for this discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_amount', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_amount', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_amount"><?php _e( 'Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_amount"><?php _e('Amount', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" name="amount" id="wpinv_discount_amount" class="wpi-field-price wpi-price" value="<?php echo esc_attr( wpinv_get_discount_amount( $discount_id ) ); ?>" required> <font class="wpi-discount-p">%</font><font class="wpi-discount-f" style="display:none;"><?php echo wpinv_currency_symbol() ;?></font>
-                <p style="display:none;" class="description"><?php _e( 'Enter the discount amount in USD', 'invoicing' ); ?></p>
-                <p class="description"><?php _e( 'Enter the discount value. Ex: 10', 'invoicing' ); ?></p>
+                <input type="text" name="amount" id="wpinv_discount_amount" class="wpi-field-price wpi-price" value="<?php echo esc_attr(wpinv_get_discount_amount($discount_id)); ?>" required> <font class="wpi-discount-p">%</font><font class="wpi-discount-f" style="display:none;"><?php echo wpinv_currency_symbol(); ?></font>
+                <p style="display:none;" class="description"><?php _e('Enter the discount amount in USD', 'invoicing'); ?></p>
+                <p class="description"><?php _e('Enter the discount value. Ex: 10', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_items', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_items', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_items"><?php _e( 'Items', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_items"><?php _e('Items', 'invoicing'); ?></label>
             </th>
             <td>
-                <p><?php echo wpinv_item_dropdown( array(
+                <p><?php echo wpinv_item_dropdown(array(
                         'name'              => 'items[]',
                         'id'                => 'items',
                         'selected'          => $item_reqs,
                         'multiple'          => true,
                         'class'             => 'medium-text wpi_select2',
-                        'placeholder'       => __( 'Select one or more Items', 'invoicing' ),
+                        'placeholder'       => __('Select one or more Items', 'invoicing'),
                         'show_recurring'    => true,
-                    ) ); ?>
+                    )); ?>
                 </p>
-                <p class="description"><?php _e( 'Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount can be used on any item.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount can be used on any item.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_excluded_items', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_excluded_items', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_excluded_items"><?php _e( 'Excluded Items', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_excluded_items"><?php _e('Excluded Items', 'invoicing'); ?></label>
             </th>
             <td>
-                <p><?php echo wpinv_item_dropdown( array(
+                <p><?php echo wpinv_item_dropdown(array(
                         'name'              => 'excluded_items[]',
                         'id'                => 'excluded_items',
                         'selected'          => $excluded_items,
                         'multiple'          => true,
                         'class'             => 'medium-text wpi_select2',
-                        'placeholder'       => __( 'Select one or more Items', 'invoicing' ),
+                        'placeholder'       => __('Select one or more Items', 'invoicing'),
                         'show_recurring'    => true,
-                    ) ); ?>
+                    )); ?>
                 </p>
-                <p class="description"><?php _e( 'Items which are NOT allowed to use this discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Items which are NOT allowed to use this discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_start', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_start', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_start"><?php _e( 'Start Date', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_start"><?php _e('Start Date', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_start" data-dateFormat="yy-mm-dd" name="start" value="<?php echo esc_attr( $start_date ); ?>"> @ <select id="wpinv_discount_start_h" name="start_h">
-                    <?php for ( $i = 0; $i <= 23; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $start_h ); ?>><?php echo $value;?></option>
+                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_start" data-dateFormat="yy-mm-dd" name="start" value="<?php echo esc_attr($start_date); ?>"> @ <select id="wpinv_discount_start_h" name="start_h">
+                    <?php for ($i = 0; $i <= 23; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $start_h); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select> : <select id="wpinv_discount_start_m" name="start_m">
-                    <?php for ( $i = 0; $i <= 59; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $start_m ); ?>><?php echo $value;?></option>
+                    <?php for ($i = 0; $i <= 59; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $start_m); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'Enter the start date for this discount code in the format of yyyy-mm-dd. For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Enter the start date for this discount code in the format of yyyy-mm-dd. For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_expiration', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_expiration', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_expiration"><?php _e( 'Expiration Date', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_expiration"><?php _e('Expiration Date', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_expiration" data-dateFormat="yy-mm-dd" name="expiration" value="<?php echo esc_attr( $expiration_date ); ?>"> @ <select id="wpinv_discount_expiration_h" name="expiration_h">
-                    <?php for ( $i = 0; $i <= 23; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $expiration_h ); ?>><?php echo $value;?></option>
+                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_expiration" data-dateFormat="yy-mm-dd" name="expiration" value="<?php echo esc_attr($expiration_date); ?>"> @ <select id="wpinv_discount_expiration_h" name="expiration_h">
+                    <?php for ($i = 0; $i <= 23; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $expiration_h); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select> : <select id="wpinv_discount_expiration_m" name="expiration_m">
-                    <?php for ( $i = 0; $i <= 59; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $expiration_m ); ?>><?php echo $value;?></option>
+                    <?php for ($i = 0; $i <= 59; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $expiration_m); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'Enter the expiration date for this discount code in the format of yyyy-mm-dd. Leave blank for no expiration.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Enter the expiration date for this discount code in the format of yyyy-mm-dd. Leave blank for no expiration.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_min_total', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_min_total', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_min_total"><?php _e( 'Minimum Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_min_total"><?php _e('Minimum Amount', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="text" name="min_total" id="wpinv_discount_min_total" class="wpi-field-price wpi-price" value="<?php echo $min_total; ?>">
-                <p class="description"><?php _e( 'This allows you to set the minimum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('This allows you to set the minimum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_max_total', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_max_total', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_max_total"><?php _e( 'Maximum Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_max_total"><?php _e('Maximum Amount', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="text" name="max_total" id="wpinv_discount_max_total" class="wpi-field-price wpi-price" value="<?php echo $max_total; ?>">
-                <p class="description"><?php _e( 'This allows you to set the maximum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('This allows you to set the maximum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_recurring', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_recurring', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_recurring"><?php _e( 'For recurring apply to', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_recurring"><?php _e('For recurring apply to', 'invoicing'); ?></label>
             </th>
             <td>
                 <select id="wpinv_discount_recurring" name="recurring" class="medium-text wpi_select2">
-                    <option value="0" <?php selected( false, $recurring ); ?>><?php _e( 'First payment only', 'invoicing' ); ?></option>
-                    <option value="1" <?php selected( true, $recurring ); ?>><?php _e( 'All payments', 'invoicing' ); ?></option>
+                    <option value="0" <?php selected(false, $recurring); ?>><?php _e('First payment only', 'invoicing'); ?></option>
+                    <option value="1" <?php selected(true, $recurring); ?>><?php _e('All payments', 'invoicing'); ?></option>
                 </select>
-                <p class="description"><?php _e( '<b>All payments:</b> Apply this discount to all recurring payments of the recurring invoice. <br><b>First payment only:</b> Apply this discount to only first payment of the recurring invoice.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('<b>All payments:</b> Apply this discount to all recurring payments of the recurring invoice. <br><b>First payment only:</b> Apply this discount to only first payment of the recurring invoice.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_max_uses', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_max_uses', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_max_uses"><?php _e( 'Max Uses', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_max_uses"><?php _e('Max Uses', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="number" min="0" step="1" id="wpinv_discount_max_uses" name="max_uses" class="medium-text" value="<?php echo $max_uses; ?>">
-                <p class="description"><?php _e( 'The maximum number of times this discount can be used. Leave blank for unlimited.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('The maximum number of times this discount can be used. Leave blank for unlimited.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_single_use', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_single_use', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_single_use"><?php _e( 'Use Once Per User', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_single_use"><?php _e('Use Once Per User', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="checkbox" value="1" name="single_use" id="wpinv_discount_single_use" <?php checked( true, $single_use ); ?>>
-                <span class="description"><?php _e( 'Limit this discount to a single use per user?', 'invoicing' ); ?></span>
+                <input type="checkbox" value="1" name="single_use" id="wpinv_discount_single_use" <?php checked(true, $single_use); ?>>
+                <span class="description"><?php _e('Limit this discount to a single use per user?', 'invoicing'); ?></span>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_last', $post ); ?>
+        <?php do_action('wpinv_discount_form_last', $post); ?>
     </tbody>
 </table>
-<?php do_action( 'wpinv_discount_form_bottom', $post ); ?>
+<?php do_action('wpinv_discount_form_bottom', $post); ?>
     <?php
 }
 
-function wpinv_discount_metabox_save( $post_id, $post, $update = false ) {
-    $post_type = !empty( $post ) ? $post->post_type : '';
+function wpinv_discount_metabox_save($post_id, $post, $update = false) {
+    $post_type = !empty($post) ? $post->post_type : '';
     
-    if ( $post_type != 'wpi_discount' ) {
+    if ($post_type != 'wpi_discount') {
         return;
     }
     
-    if ( !isset( $_POST['wpinv_discount_metabox_nonce'] ) || ( isset( $_POST['wpinv_discount_metabox_nonce'] ) && !wp_verify_nonce( $_POST['wpinv_discount_metabox_nonce'], 'wpinv_discount_metabox_nonce' ) ) ) {
+    if (!isset($_POST['wpinv_discount_metabox_nonce']) || (isset($_POST['wpinv_discount_metabox_nonce']) && !wp_verify_nonce($_POST['wpinv_discount_metabox_nonce'], 'wpinv_discount_metabox_nonce'))) {
         return;
     }
     
-    if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+    if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || (defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
         return;
     }
     
-    if ( !current_user_can( wpinv_get_capability(), $post_id ) ) {
+    if (!current_user_can(wpinv_get_capability(), $post_id)) {
         return;
     }
     
-    if ( !empty( $_POST['start'] ) && isset( $_POST['start_h'] ) && isset( $_POST['start_m'] ) && $_POST['start_h'] !== '' && $_POST['start_m'] !== '' ) {
+    if (!empty($_POST['start']) && isset($_POST['start_h']) && isset($_POST['start_m']) && $_POST['start_h'] !== '' && $_POST['start_m'] !== '') {
         $_POST['start'] = $_POST['start'] . ' ' . $_POST['start_h'] . ':' . $_POST['start_m'];
     }
 
-    if ( !empty( $_POST['expiration'] ) && isset( $_POST['expiration_h'] ) && isset( $_POST['expiration_m'] ) ) {
+    if (!empty($_POST['expiration']) && isset($_POST['expiration_h']) && isset($_POST['expiration_m'])) {
         $_POST['expiration'] = $_POST['expiration'] . ' ' . $_POST['expiration_h'] . ':' . $_POST['expiration_m'];
     }
     
-    return /** @scrutinizer ignore-call */ wpinv_store_discount( $post_id, $_POST, $post, $update );
+    return /** @scrutinizer ignore-call */ wpinv_store_discount($post_id, $_POST, $post, $update);
 }
-add_action( 'save_post', 'wpinv_discount_metabox_save', 10, 3 );
+add_action('save_post', 'wpinv_discount_metabox_save', 10, 3);
 
 /**
  * Remove trash link from the default form.
  */
-function getpaid_remove_action_link( $actions, $post ) {
-    $post = get_post( $post );
-    if ( 'wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form() ) {
-        unset( $actions['trash'] );
-        unset( $actions['inline hide-if-no-js'] );
+function getpaid_remove_action_link($actions, $post) {
+    $post = get_post($post);
+    if ('wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form()) {
+        unset($actions['trash']);
+        unset($actions['inline hide-if-no-js']);
     }
     return $actions;
 }
-add_filter( 'post_row_actions', 'getpaid_remove_action_link', 10, 2 );
+add_filter('post_row_actions', 'getpaid_remove_action_link', 10, 2);

includes/wpinv-helper-functions.php

Indentation +16 added lines, -16 removed lines

@@ -708,13 +708,13 @@ 
  * @param mixed  $value Value.
  */
 function getpaid_maybe_define_constant( $name, $value ) {
-	if ( ! defined( $name ) ) {
-		define( $name, $value );
-	}
+    if ( ! defined( $name ) ) {
+        define( $name, $value );
+    }
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+    return ini_get( 'arg_separator.output' );
 }
 
 function wpinv_rgb_from_hex( $color ) {
@@ -1058,11 +1058,11 @@ 
  * @return array Sanitized array of values.
  */
 function wpinv_parse_list( $list ) {
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
-	}
+    if ( ! is_array( $list ) ) {
+        return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+    }
 
-	return $list;
+    return $list;
 }
 
 /**
@@ -1082,9 +1082,9 @@ 
     }
 
     $data = apply_filters( "wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php" );
-	wp_cache_set( "wpinv-$key", $data, 'wpinv' );
+    wp_cache_set( "wpinv-$key", $data, 'wpinv' );
 
-	return $data;
+    return $data;
 }
 
 /**
@@ -1113,17 +1113,17 @@ 
  */
 function wpinv_clean( $var ) {
 
-	if ( is_array( $var ) ) {
-		return array_map( 'wpinv_clean', $var );
+    if ( is_array( $var ) ) {
+        return array_map( 'wpinv_clean', $var );
     }
 
     if ( is_object( $var ) ) {
-		$object_vars = get_object_vars( $var );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$var->$property_name = wpinv_clean( $property_value );
+        $object_vars = get_object_vars( $var );
+        foreach ( $object_vars as $property_name => $property_value ) {
+            $var->$property_name = wpinv_clean( $property_value );
         }
         return $var;
-	}
+    }
     
     return is_string( $var ) ? sanitize_text_field( $var ) : $var;
 }
\ No newline at end of file

Spacing +414 added lines, -414 removed lines

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

includes/wpinv-error-functions.php

Indentation +9 added lines, -9 removed lines

@@ -13,9 +13,9 @@ 
         ) );
         echo '<div class="' . implode( ' ', $classes ) . '">';
             // Loop error codes and display errors
-           foreach ( $errors as $error_id => $error ) {
+            foreach ( $errors as $error_id => $error ) {
                 echo '<p class="wpinv_error" id="wpinv_error_' . $error_id . '"><strong>' . __( 'Error', 'invoicing' ) . '</strong>: ' . $error . '</p>';
-           }
+            }
         echo '</div>';
         wpinv_clear_errors();
     }
@@ -79,13 +79,13 @@ 
  */
 function getpaid_doing_it_wrong( $function, $message, $version ) {
 
-	$message .= ' Backtrace: ' . wp_debug_backtrace_summary();
+    $message .= ' Backtrace: ' . wp_debug_backtrace_summary();
 
-	if ( is_ajax() || defined( 'REST_REQUEST' ) ) {
-		do_action( 'doing_it_wrong_run', $function, $message, $version );
-		error_log( "{$function} was called incorrectly. {$message}. This message was added in version {$version}." );
-	} else {
-		_doing_it_wrong( $function, $message, $version );
-	}
+    if ( is_ajax() || defined( 'REST_REQUEST' ) ) {
+        do_action( 'doing_it_wrong_run', $function, $message, $version );
+        error_log( "{$function} was called incorrectly. {$message}. This message was added in version {$version}." );
+    } else {
+        _doing_it_wrong( $function, $message, $version );
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -1,61 +1,61 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_print_errors() {
     $errors = wpinv_get_errors();
 
-    if ( $errors ) {
-        $classes = apply_filters( 'wpinv_error_class', array(
+    if ($errors) {
+        $classes = apply_filters('wpinv_error_class', array(
             'wpinv_errors', 'wpinv-alert', 'wpinv-alert-error'
-        ) );
-        echo '<div class="' . implode( ' ', $classes ) . '">';
+        ));
+        echo '<div class="' . implode(' ', $classes) . '">';
             // Loop error codes and display errors
-           foreach ( $errors as $error_id => $error ) {
-                echo '<p class="wpinv_error" id="wpinv_error_' . $error_id . '"><strong>' . __( 'Error', 'invoicing' ) . '</strong>: ' . $error . '</p>';
+           foreach ($errors as $error_id => $error) {
+                echo '<p class="wpinv_error" id="wpinv_error_' . $error_id . '"><strong>' . __('Error', 'invoicing') . '</strong>: ' . $error . '</p>';
            }
         echo '</div>';
         wpinv_clear_errors();
     }
 }
-add_action( 'wpinv_purchase_form_before_submit', 'wpinv_print_errors' );
-add_action( 'wpinv_ajax_checkout_errors', 'wpinv_print_errors' );
+add_action('wpinv_purchase_form_before_submit', 'wpinv_print_errors');
+add_action('wpinv_ajax_checkout_errors', 'wpinv_print_errors');
 
 function wpinv_get_errors() {
     global $wpi_session;
     
-    return $wpi_session->get( 'wpinv_errors' );
+    return $wpi_session->get('wpinv_errors');
 }
 
-function wpinv_set_error( $error_id, $error_message ) {
+function wpinv_set_error($error_id, $error_message) {
     global $wpi_session;
     
     $errors = wpinv_get_errors();
 
-    if ( ! $errors ) {
+    if (!$errors) {
         $errors = array();
     }
 
-    $errors[ $error_id ] = $error_message;
-    $wpi_session->set( 'wpinv_errors', $errors );
+    $errors[$error_id] = $error_message;
+    $wpi_session->set('wpinv_errors', $errors);
 }
 
 function wpinv_clear_errors() {
     global $wpi_session;
     
-    $wpi_session->set( 'wpinv_errors', null );
+    $wpi_session->set('wpinv_errors', null);
 }
 
-function wpinv_unset_error( $error_id ) {
+function wpinv_unset_error($error_id) {
     global $wpi_session;
     
     $errors = wpinv_get_errors();
 
-    if ( $errors ) {
-        unset( $errors[ $error_id ] );
-        $wpi_session->set( 'wpinv_errors', $errors );
+    if ($errors) {
+        unset($errors[$error_id]);
+        $wpi_session->set('wpinv_errors', $errors);
     }
 }
 
@@ -63,10 +63,10 @@ 
     die();
 }
 
-function wpinv_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', 'wpinv_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', 'wpinv_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function wpinv_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', 'wpinv_die_handler', 10, 3);
+    add_filter('wp_die_handler', 'wpinv_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
 
 /**
@@ -77,15 +77,15 @@ 
  * @param string $message Message to log.
  * @param string $version Version the message was added in.
  */
-function getpaid_doing_it_wrong( $function, $message, $version ) {
+function getpaid_doing_it_wrong($function, $message, $version) {
 
 	$message .= ' Backtrace: ' . wp_debug_backtrace_summary();
 
-	if ( is_ajax() || defined( 'REST_REQUEST' ) ) {
-		do_action( 'doing_it_wrong_run', $function, $message, $version );
-		error_log( "{$function} was called incorrectly. {$message}. This message was added in version {$version}." );
+	if (is_ajax() || defined('REST_REQUEST')) {
+		do_action('doing_it_wrong_run', $function, $message, $version);
+		error_log("{$function} was called incorrectly. {$message}. This message was added in version {$version}.");
 	} else {
-		_doing_it_wrong( $function, $message, $version );
+		_doing_it_wrong($function, $message, $version);
 	}
 
 }

includes/data-stores/class-getpaid-data-store.php

Spacing +29 added lines, -29 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Data store class.
@@ -53,31 +53,31 @@ 
 	 *
 	 * @param string $object_type Name of object.
 	 */
-	public function __construct( $object_type ) {
+	public function __construct($object_type) {
 		$this->object_type = $object_type;
-		$this->stores      = apply_filters( 'getpaid_data_stores', $this->stores );
+		$this->stores      = apply_filters('getpaid_data_stores', $this->stores);
 
 		// If this object type can't be found, check to see if we can load one
 		// level up (so if item-type isn't found, we try item).
-		if ( ! array_key_exists( $object_type, $this->stores ) ) {
-			$pieces      = explode( '-', $object_type );
+		if (!array_key_exists($object_type, $this->stores)) {
+			$pieces      = explode('-', $object_type);
 			$object_type = $pieces[0];
 		}
 
-		if ( array_key_exists( $object_type, $this->stores ) ) {
-			$store = apply_filters( 'getpaid_' . $object_type . '_data_store', $this->stores[ $object_type ] );
-			if ( is_object( $store ) ) {
-				$this->current_class_name = get_class( $store );
+		if (array_key_exists($object_type, $this->stores)) {
+			$store = apply_filters('getpaid_' . $object_type . '_data_store', $this->stores[$object_type]);
+			if (is_object($store)) {
+				$this->current_class_name = get_class($store);
 				$this->instance           = $store;
 			} else {
-				if ( ! class_exists( $store ) ) {
-					throw new Exception( __( 'Invalid data store.', 'invoicing' ) );
+				if (!class_exists($store)) {
+					throw new Exception(__('Invalid data store.', 'invoicing'));
 				}
 				$this->current_class_name = $store;
 				$this->instance           = new $store();
 			}
 		} else {
-			throw new Exception( __( 'Invalid data store.', 'invoicing' ) );
+			throw new Exception(__('Invalid data store.', 'invoicing'));
 		}
 	}
 
@@ -87,7 +87,7 @@ 
 	 * @return array
 	 */
 	public function __sleep() {
-		return array( 'object_type' );
+		return array('object_type');
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 * @throws Exception When validation fails.
 	 */
 	public function __wakeup() {
-		$this->__construct( $this->object_type );
+		$this->__construct($this->object_type);
 	}
 
 	/**
@@ -108,8 +108,8 @@ 
 	 * @throws Exception When validation fails.
 	 * @return GetPaid_Data_Store
 	 */
-	public static function load( $object_type ) {
-		return new GetPaid_Data_Store( $object_type );
+	public static function load($object_type) {
+		return new GetPaid_Data_Store($object_type);
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	 * @since 1.0.19
 	 * @param GetPaid_Data $data GetPaid data instance.
 	 */
-	public function read( &$data ) {
-		$this->instance->read( $data );
+	public function read(&$data) {
+		$this->instance->read($data);
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 	 * @since 1.0.19
 	 * @param GetPaid_Data $data GetPaid data instance.
 	 */
-	public function create( &$data ) {
-		$this->instance->create( $data );
+	public function create(&$data) {
+		$this->instance->create($data);
 	}
 
 	/**
@@ -148,8 +148,8 @@ 
 	 * @since 1.0.19
 	 * @param GetPaid_Data $data GetPaid data instance.
 	 */
-	public function update( &$data ) {
-		$this->instance->update( $data );
+	public function update(&$data) {
+		$this->instance->update($data);
 	}
 
 	/**
@@ -159,8 +159,8 @@ 
 	 * @param GetPaid_Data $data GetPaid data instance.
 	 * @param array   $args Array of args to pass to the delete method.
 	 */
-	public function delete( &$data, $args = array() ) {
-		$this->instance->delete( $data, $args );
+	public function delete(&$data, $args = array()) {
+		$this->instance->delete($data, $args);
 	}
 
 	/**
@@ -171,11 +171,11 @@ 
 	 * @param string $method     Method.
 	 * @return mixed
 	 */
-	public function __call( $method, $parameters ) {
-		if ( is_callable( array( $this->instance, $method ) ) ) {
-			$object     = array_shift( $parameters );
-			$parameters = array_merge( array( &$object ), $parameters );
-			return call_user_func_array( array( $this->instance, $method ), $parameters );
+	public function __call($method, $parameters) {
+		if (is_callable(array($this->instance, $method))) {
+			$object     = array_shift($parameters);
+			$parameters = array_merge(array(&$object), $parameters);
+			return call_user_func_array(array($this->instance, $method), $parameters);
 		}
 	}
 }

Indentation +167 added lines, -167 removed lines

@@ -11,171 +11,171 @@
  */
 class GetPaid_Data_Store {
 
-	/**
-	 * Contains an instance of the data store class that we are working with.
-	 *
-	 * @var GetPaid_Data_Store
-	 */
-	private $instance = null;
-
-	/**
-	 * Contains an array of default GetPaid supported data stores.
-	 * Format of object name => class name.
-	 * Example: 'item' => 'GetPaid_Item_Data_Store'
-	 * You can also pass something like item-<type> for item stores and
-	 * that type will be used first when available, if a store is requested like
-	 * this and doesn't exist, then the store would fall back to 'item'.
-	 * Ran through `getpaid_data_stores`.
-	 *
-	 * @var array
-	 */
-	private $stores = array(
-		'item' => 'GetPaid_Item_Data_Store',
-	);
-
-	/**
-	 * Contains the name of the current data store's class name.
-	 *
-	 * @var string
-	 */
-	private $current_class_name = '';
-
-	/**
-	 * The object type this store works with.
-	 *
-	 * @var string
-	 */
-	private $object_type = '';
-
-	/**
-	 * Tells GetPaid_Data_Store which object
-	 * store we want to work with.
-	 *
-	 * @param string $object_type Name of object.
-	 */
-	public function __construct( $object_type ) {
-		$this->object_type = $object_type;
-		$this->stores      = apply_filters( 'getpaid_data_stores', $this->stores );
-
-		// If this object type can't be found, check to see if we can load one
-		// level up (so if item-type isn't found, we try item).
-		if ( ! array_key_exists( $object_type, $this->stores ) ) {
-			$pieces      = explode( '-', $object_type );
-			$object_type = $pieces[0];
-		}
-
-		if ( array_key_exists( $object_type, $this->stores ) ) {
-			$store = apply_filters( 'getpaid_' . $object_type . '_data_store', $this->stores[ $object_type ] );
-			if ( is_object( $store ) ) {
-				$this->current_class_name = get_class( $store );
-				$this->instance           = $store;
-			} else {
-				if ( ! class_exists( $store ) ) {
-					throw new Exception( __( 'Invalid data store.', 'invoicing' ) );
-				}
-				$this->current_class_name = $store;
-				$this->instance           = new $store();
-			}
-		} else {
-			throw new Exception( __( 'Invalid data store.', 'invoicing' ) );
-		}
-	}
-
-	/**
-	 * Only store the object type to avoid serializing the data store instance.
-	 *
-	 * @return array
-	 */
-	public function __sleep() {
-		return array( 'object_type' );
-	}
-
-	/**
-	 * Re-run the constructor with the object type.
-	 *
-	 * @throws Exception When validation fails.
-	 */
-	public function __wakeup() {
-		$this->__construct( $this->object_type );
-	}
-
-	/**
-	 * Loads a data store.
-	 *
-	 * @param string $object_type Name of object.
-	 *
-	 * @since 1.0.19
-	 * @throws Exception When validation fails.
-	 * @return GetPaid_Data_Store
-	 */
-	public static function load( $object_type ) {
-		return new GetPaid_Data_Store( $object_type );
-	}
-
-	/**
-	 * Returns the class name of the current data store.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_current_class_name() {
-		return $this->current_class_name;
-	}
-
-	/**
-	 * Reads an object from the data store.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Data $data GetPaid data instance.
-	 */
-	public function read( &$data ) {
-		$this->instance->read( $data );
-	}
-
-	/**
-	 * Create an object in the data store.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Data $data GetPaid data instance.
-	 */
-	public function create( &$data ) {
-		$this->instance->create( $data );
-	}
-
-	/**
-	 * Update an object in the data store.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Data $data GetPaid data instance.
-	 */
-	public function update( &$data ) {
-		$this->instance->update( $data );
-	}
-
-	/**
-	 * Delete an object from the data store.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Data $data GetPaid data instance.
-	 * @param array   $args Array of args to pass to the delete method.
-	 */
-	public function delete( &$data, $args = array() ) {
-		$this->instance->delete( $data, $args );
-	}
-
-	/**
-	 * Data stores can define additional function. This passes
-	 * through to the instance if that function exists.
-	 *
-	 * @since 1.0.19
-	 * @param string $method     Method.
-	 * @return mixed
-	 */
-	public function __call( $method, $parameters ) {
-		if ( is_callable( array( $this->instance, $method ) ) ) {
-			$object     = array_shift( $parameters );
-			$parameters = array_merge( array( &$object ), $parameters );
-			return call_user_func_array( array( $this->instance, $method ), $parameters );
-		}
-	}
+    /**
+     * Contains an instance of the data store class that we are working with.
+     *
+     * @var GetPaid_Data_Store
+     */
+    private $instance = null;
+
+    /**
+     * Contains an array of default GetPaid supported data stores.
+     * Format of object name => class name.
+     * Example: 'item' => 'GetPaid_Item_Data_Store'
+     * You can also pass something like item-<type> for item stores and
+     * that type will be used first when available, if a store is requested like
+     * this and doesn't exist, then the store would fall back to 'item'.
+     * Ran through `getpaid_data_stores`.
+     *
+     * @var array
+     */
+    private $stores = array(
+        'item' => 'GetPaid_Item_Data_Store',
+    );
+
+    /**
+     * Contains the name of the current data store's class name.
+     *
+     * @var string
+     */
+    private $current_class_name = '';
+
+    /**
+     * The object type this store works with.
+     *
+     * @var string
+     */
+    private $object_type = '';
+
+    /**
+     * Tells GetPaid_Data_Store which object
+     * store we want to work with.
+     *
+     * @param string $object_type Name of object.
+     */
+    public function __construct( $object_type ) {
+        $this->object_type = $object_type;
+        $this->stores      = apply_filters( 'getpaid_data_stores', $this->stores );
+
+        // If this object type can't be found, check to see if we can load one
+        // level up (so if item-type isn't found, we try item).
+        if ( ! array_key_exists( $object_type, $this->stores ) ) {
+            $pieces      = explode( '-', $object_type );
+            $object_type = $pieces[0];
+        }
+
+        if ( array_key_exists( $object_type, $this->stores ) ) {
+            $store = apply_filters( 'getpaid_' . $object_type . '_data_store', $this->stores[ $object_type ] );
+            if ( is_object( $store ) ) {
+                $this->current_class_name = get_class( $store );
+                $this->instance           = $store;
+            } else {
+                if ( ! class_exists( $store ) ) {
+                    throw new Exception( __( 'Invalid data store.', 'invoicing' ) );
+                }
+                $this->current_class_name = $store;
+                $this->instance           = new $store();
+            }
+        } else {
+            throw new Exception( __( 'Invalid data store.', 'invoicing' ) );
+        }
+    }
+
+    /**
+     * Only store the object type to avoid serializing the data store instance.
+     *
+     * @return array
+     */
+    public function __sleep() {
+        return array( 'object_type' );
+    }
+
+    /**
+     * Re-run the constructor with the object type.
+     *
+     * @throws Exception When validation fails.
+     */
+    public function __wakeup() {
+        $this->__construct( $this->object_type );
+    }
+
+    /**
+     * Loads a data store.
+     *
+     * @param string $object_type Name of object.
+     *
+     * @since 1.0.19
+     * @throws Exception When validation fails.
+     * @return GetPaid_Data_Store
+     */
+    public static function load( $object_type ) {
+        return new GetPaid_Data_Store( $object_type );
+    }
+
+    /**
+     * Returns the class name of the current data store.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_current_class_name() {
+        return $this->current_class_name;
+    }
+
+    /**
+     * Reads an object from the data store.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Data $data GetPaid data instance.
+     */
+    public function read( &$data ) {
+        $this->instance->read( $data );
+    }
+
+    /**
+     * Create an object in the data store.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Data $data GetPaid data instance.
+     */
+    public function create( &$data ) {
+        $this->instance->create( $data );
+    }
+
+    /**
+     * Update an object in the data store.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Data $data GetPaid data instance.
+     */
+    public function update( &$data ) {
+        $this->instance->update( $data );
+    }
+
+    /**
+     * Delete an object from the data store.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Data $data GetPaid data instance.
+     * @param array   $args Array of args to pass to the delete method.
+     */
+    public function delete( &$data, $args = array() ) {
+        $this->instance->delete( $data, $args );
+    }
+
+    /**
+     * Data stores can define additional function. This passes
+     * through to the instance if that function exists.
+     *
+     * @since 1.0.19
+     * @param string $method     Method.
+     * @return mixed
+     */
+    public function __call( $method, $parameters ) {
+        if ( is_callable( array( $this->instance, $method ) ) ) {
+            $object     = array_shift( $parameters );
+            $parameters = array_merge( array( &$object ), $parameters );
+            return call_user_func_array( array( $this->instance, $method ), $parameters );
+        }
+    }
 }

includes/data-stores/class-getpaid-cache-helper.php

Indentation +115 added lines, -115 removed lines

@@ -11,121 +11,121 @@
  */
 class GetPaid_Cache_Helper {
 
-	/**
-	 * Transients to delete on shutdown.
-	 *
-	 * @var array Array of transient keys.
-	 */
-	private static $delete_transients = array();
-
-	/**
-	 * Hook in methods.
-	 */
-	public static function init() {
-		add_action( 'shutdown', array( __CLASS__, 'delete_transients_on_shutdown' ), 10 );
-		add_action( 'wp', array( __CLASS__, 'prevent_caching' ) );
-	}
-
-	/**
-	 * Add a transient to delete on shutdown.
-	 *
-	 * @since 1.0.19
-	 * @param string|array $keys Transient key or keys.
-	 */
-	public static function queue_delete_transient( $keys ) {
-		self::$delete_transients = array_unique( array_merge( is_array( $keys ) ? $keys : array( $keys ), self::$delete_transients ) );
-	}
-
-	/**
-	 * Transients that don't need to be cleaned right away can be deleted on shutdown to avoid repetition.
-	 *
-	 * @since 1.0.19
-	 */
-	public static function delete_transients_on_shutdown() {
-		if ( self::$delete_transients ) {
-			foreach ( self::$delete_transients as $key ) {
-				delete_transient( $key );
-			}
-			self::$delete_transients = array();
-		}
-	}
-
-	/**
-	 * Get prefix for use with wp_cache_set. Allows all cache in a group to be invalidated at once.
-	 *
-	 * @param  string $group Group of cache to get.
-	 * @return string
-	 */
-	public static function get_cache_prefix( $group ) {
-		// Get cache key.
-		$prefix = wp_cache_get( 'getpaid_' . $group . '_cache_prefix', $group );
-
-		if ( false === $prefix ) {
-			$prefix = microtime();
-			wp_cache_set( 'getpaid_' . $group . '_cache_prefix', $prefix, $group );
-		}
-
-		return 'getpaid_cache_' . $prefix . '_';
-	}
-
-	/**
-	 * Invalidate cache group.
-	 *
-	 * @param string $group Group of cache to clear.
-	 * @since 1.0.19
-	 */
-	public static function invalidate_cache_group( $group ) {
-		wp_cache_set( 'getpaid_' . $group . '_cache_prefix', microtime(), $group );
-	}
-
-	/**
-	 * Prevent caching on certain pages
-	 */
-	public static function prevent_caching() {
-		if ( ! is_blog_installed() ) {
-			return;
-		}
-
-		if ( wpinv_is_checkout() || wpinv_is_success_page() || wpinv_is_invoice_history_page() || wpinv_is_subscriptions_history_page() ) {
-			self::set_nocache_constants();
-			nocache_headers();
-		}
-
-	}
-
-	/**
-	 * Get transient version.
-	 *
-	 *
-	 * @param  string  $group   Name for the group of transients we need to invalidate.
-	 * @param  boolean $refresh true to force a new version.
-	 * @return string transient version based on time(), 10 digits.
-	 */
-	public static function get_transient_version( $group, $refresh = false ) {
-		$transient_name  = $group . '-transient-version';
-		$transient_value = get_transient( $transient_name );
-
-		if ( false === $transient_value || true === $refresh ) {
-			$transient_value = (string) time();
-
-			set_transient( $transient_name, $transient_value );
-		}
-
-		return $transient_value;
-	}
-
-	/**
-	 * Set constants to prevent caching by some plugins.
-	 *
-	 * @param  mixed $return Value to return. Previously hooked into a filter.
-	 * @return mixed
-	 */
-	public static function set_nocache_constants( $return = true ) {
-		getpaid_maybe_define_constant( 'DONOTCACHEPAGE', true );
-		getpaid_maybe_define_constant( 'DONOTCACHEOBJECT', true );
-		getpaid_maybe_define_constant( 'DONOTCACHEDB', true );
-		return $return;
-	}
+    /**
+     * Transients to delete on shutdown.
+     *
+     * @var array Array of transient keys.
+     */
+    private static $delete_transients = array();
+
+    /**
+     * Hook in methods.
+     */
+    public static function init() {
+        add_action( 'shutdown', array( __CLASS__, 'delete_transients_on_shutdown' ), 10 );
+        add_action( 'wp', array( __CLASS__, 'prevent_caching' ) );
+    }
+
+    /**
+     * Add a transient to delete on shutdown.
+     *
+     * @since 1.0.19
+     * @param string|array $keys Transient key or keys.
+     */
+    public static function queue_delete_transient( $keys ) {
+        self::$delete_transients = array_unique( array_merge( is_array( $keys ) ? $keys : array( $keys ), self::$delete_transients ) );
+    }
+
+    /**
+     * Transients that don't need to be cleaned right away can be deleted on shutdown to avoid repetition.
+     *
+     * @since 1.0.19
+     */
+    public static function delete_transients_on_shutdown() {
+        if ( self::$delete_transients ) {
+            foreach ( self::$delete_transients as $key ) {
+                delete_transient( $key );
+            }
+            self::$delete_transients = array();
+        }
+    }
+
+    /**
+     * Get prefix for use with wp_cache_set. Allows all cache in a group to be invalidated at once.
+     *
+     * @param  string $group Group of cache to get.
+     * @return string
+     */
+    public static function get_cache_prefix( $group ) {
+        // Get cache key.
+        $prefix = wp_cache_get( 'getpaid_' . $group . '_cache_prefix', $group );
+
+        if ( false === $prefix ) {
+            $prefix = microtime();
+            wp_cache_set( 'getpaid_' . $group . '_cache_prefix', $prefix, $group );
+        }
+
+        return 'getpaid_cache_' . $prefix . '_';
+    }
+
+    /**
+     * Invalidate cache group.
+     *
+     * @param string $group Group of cache to clear.
+     * @since 1.0.19
+     */
+    public static function invalidate_cache_group( $group ) {
+        wp_cache_set( 'getpaid_' . $group . '_cache_prefix', microtime(), $group );
+    }
+
+    /**
+     * Prevent caching on certain pages
+     */
+    public static function prevent_caching() {
+        if ( ! is_blog_installed() ) {
+            return;
+        }
+
+        if ( wpinv_is_checkout() || wpinv_is_success_page() || wpinv_is_invoice_history_page() || wpinv_is_subscriptions_history_page() ) {
+            self::set_nocache_constants();
+            nocache_headers();
+        }
+
+    }
+
+    /**
+     * Get transient version.
+     *
+     *
+     * @param  string  $group   Name for the group of transients we need to invalidate.
+     * @param  boolean $refresh true to force a new version.
+     * @return string transient version based on time(), 10 digits.
+     */
+    public static function get_transient_version( $group, $refresh = false ) {
+        $transient_name  = $group . '-transient-version';
+        $transient_value = get_transient( $transient_name );
+
+        if ( false === $transient_value || true === $refresh ) {
+            $transient_value = (string) time();
+
+            set_transient( $transient_name, $transient_value );
+        }
+
+        return $transient_value;
+    }
+
+    /**
+     * Set constants to prevent caching by some plugins.
+     *
+     * @param  mixed $return Value to return. Previously hooked into a filter.
+     * @return mixed
+     */
+    public static function set_nocache_constants( $return = true ) {
+        getpaid_maybe_define_constant( 'DONOTCACHEPAGE', true );
+        getpaid_maybe_define_constant( 'DONOTCACHEOBJECT', true );
+        getpaid_maybe_define_constant( 'DONOTCACHEDB', true );
+        return $return;
+    }
 
 }
 

Spacing +24 added lines, -24 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Cache_Helper.
@@ -22,8 +22,8 @@ 
 	 * Hook in methods.
 	 */
 	public static function init() {
-		add_action( 'shutdown', array( __CLASS__, 'delete_transients_on_shutdown' ), 10 );
-		add_action( 'wp', array( __CLASS__, 'prevent_caching' ) );
+		add_action('shutdown', array(__CLASS__, 'delete_transients_on_shutdown'), 10);
+		add_action('wp', array(__CLASS__, 'prevent_caching'));
 	}
 
 	/**
@@ -32,8 +32,8 @@ 
 	 * @since 1.0.19
 	 * @param string|array $keys Transient key or keys.
 	 */
-	public static function queue_delete_transient( $keys ) {
-		self::$delete_transients = array_unique( array_merge( is_array( $keys ) ? $keys : array( $keys ), self::$delete_transients ) );
+	public static function queue_delete_transient($keys) {
+		self::$delete_transients = array_unique(array_merge(is_array($keys) ? $keys : array($keys), self::$delete_transients));
 	}
 
 	/**
@@ -42,9 +42,9 @@ 
 	 * @since 1.0.19
 	 */
 	public static function delete_transients_on_shutdown() {
-		if ( self::$delete_transients ) {
-			foreach ( self::$delete_transients as $key ) {
-				delete_transient( $key );
+		if (self::$delete_transients) {
+			foreach (self::$delete_transients as $key) {
+				delete_transient($key);
 			}
 			self::$delete_transients = array();
 		}
@@ -56,13 +56,13 @@ 
 	 * @param  string $group Group of cache to get.
 	 * @return string
 	 */
-	public static function get_cache_prefix( $group ) {
+	public static function get_cache_prefix($group) {
 		// Get cache key.
-		$prefix = wp_cache_get( 'getpaid_' . $group . '_cache_prefix', $group );
+		$prefix = wp_cache_get('getpaid_' . $group . '_cache_prefix', $group);
 
-		if ( false === $prefix ) {
+		if (false === $prefix) {
 			$prefix = microtime();
-			wp_cache_set( 'getpaid_' . $group . '_cache_prefix', $prefix, $group );
+			wp_cache_set('getpaid_' . $group . '_cache_prefix', $prefix, $group);
 		}
 
 		return 'getpaid_cache_' . $prefix . '_';
@@ -74,19 +74,19 @@ 
 	 * @param string $group Group of cache to clear.
 	 * @since 1.0.19
 	 */
-	public static function invalidate_cache_group( $group ) {
-		wp_cache_set( 'getpaid_' . $group . '_cache_prefix', microtime(), $group );
+	public static function invalidate_cache_group($group) {
+		wp_cache_set('getpaid_' . $group . '_cache_prefix', microtime(), $group);
 	}
 
 	/**
 	 * Prevent caching on certain pages
 	 */
 	public static function prevent_caching() {
-		if ( ! is_blog_installed() ) {
+		if (!is_blog_installed()) {
 			return;
 		}
 
-		if ( wpinv_is_checkout() || wpinv_is_success_page() || wpinv_is_invoice_history_page() || wpinv_is_subscriptions_history_page() ) {
+		if (wpinv_is_checkout() || wpinv_is_success_page() || wpinv_is_invoice_history_page() || wpinv_is_subscriptions_history_page()) {
 			self::set_nocache_constants();
 			nocache_headers();
 		}
@@ -101,14 +101,14 @@ 
 	 * @param  boolean $refresh true to force a new version.
 	 * @return string transient version based on time(), 10 digits.
 	 */
-	public static function get_transient_version( $group, $refresh = false ) {
+	public static function get_transient_version($group, $refresh = false) {
 		$transient_name  = $group . '-transient-version';
-		$transient_value = get_transient( $transient_name );
+		$transient_value = get_transient($transient_name);
 
-		if ( false === $transient_value || true === $refresh ) {
+		if (false === $transient_value || true === $refresh) {
 			$transient_value = (string) time();
 
-			set_transient( $transient_name, $transient_value );
+			set_transient($transient_name, $transient_value);
 		}
 
 		return $transient_value;
@@ -120,10 +120,10 @@ 
 	 * @param  mixed $return Value to return. Previously hooked into a filter.
 	 * @return mixed
 	 */
-	public static function set_nocache_constants( $return = true ) {
-		getpaid_maybe_define_constant( 'DONOTCACHEPAGE', true );
-		getpaid_maybe_define_constant( 'DONOTCACHEOBJECT', true );
-		getpaid_maybe_define_constant( 'DONOTCACHEDB', true );
+	public static function set_nocache_constants($return = true) {
+		getpaid_maybe_define_constant('DONOTCACHEPAGE', true);
+		getpaid_maybe_define_constant('DONOTCACHEOBJECT', true);
+		getpaid_maybe_define_constant('DONOTCACHEDB', true);
 		return $return;
 	}
 

includes/data-stores/class-getpaid-data-store-wp.php

Indentation +209 added lines, -209 removed lines

@@ -12,217 +12,217 @@
  */
 class GetPaid_Data_Store_WP {
 
-	/**
-	 * Meta type. This should match up with
-	 * the types available at https://developer.wordpress.org/reference/functions/add_metadata/.
-	 * WP defines 'post', 'user', 'comment', and 'term'.
-	 *
-	 * @var string
-	 */
-	protected $meta_type = 'post';
-
-	/**
-	 * This only needs set if you are using a custom metadata type (for example payment tokens.
-	 *
-	 * @var string
-	 */
-	protected $object_id_field_for_meta = '';
-
-	/**
-	 * Data stored in meta keys, but not considered "meta" for an object.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $internal_meta_keys = array();
-
-	/**
-	 * Meta data which should exist in the DB, even if empty.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $must_exist_meta_keys = array();
-
-	/**
-	 * Returns an array of meta for an object.
-	 *
-	 * @since  1.0.19
-	 * @param  GetPaid_Data $object GetPaid_Data object.
-	 * @return array
-	 */
-	public function read_meta( &$object ) {
-		global $wpdb;
-		$db_info       = $this->get_db_info();
-		$raw_meta_data = $wpdb->get_results(
-			$wpdb->prepare(
-				"SELECT {$db_info['meta_id_field']} as meta_id, meta_key, meta_value
+    /**
+     * Meta type. This should match up with
+     * the types available at https://developer.wordpress.org/reference/functions/add_metadata/.
+     * WP defines 'post', 'user', 'comment', and 'term'.
+     *
+     * @var string
+     */
+    protected $meta_type = 'post';
+
+    /**
+     * This only needs set if you are using a custom metadata type (for example payment tokens.
+     *
+     * @var string
+     */
+    protected $object_id_field_for_meta = '';
+
+    /**
+     * Data stored in meta keys, but not considered "meta" for an object.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $internal_meta_keys = array();
+
+    /**
+     * Meta data which should exist in the DB, even if empty.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $must_exist_meta_keys = array();
+
+    /**
+     * Returns an array of meta for an object.
+     *
+     * @since  1.0.19
+     * @param  GetPaid_Data $object GetPaid_Data object.
+     * @return array
+     */
+    public function read_meta( &$object ) {
+        global $wpdb;
+        $db_info       = $this->get_db_info();
+        $raw_meta_data = $wpdb->get_results(
+            $wpdb->prepare(
+                "SELECT {$db_info['meta_id_field']} as meta_id, meta_key, meta_value
 				FROM {$db_info['table']}
 				WHERE {$db_info['object_id_field']} = %d
 				ORDER BY {$db_info['meta_id_field']}",
-				$object->get_id()
-			)
-		);
-
-		$this->internal_meta_keys = array_merge( array_map( array( $this, 'prefix_key' ), $object->get_data_keys() ), $this->internal_meta_keys );
-		$meta_data                = array_filter( $raw_meta_data, array( $this, 'exclude_internal_meta_keys' ) );
-		return apply_filters( "getpaid_data_store_wp_{$this->meta_type}_read_meta", $meta_data, $object, $this );
-	}
-
-	/**
-	 * Deletes meta based on meta ID.
-	 *
-	 * @since  1.0.19
-	 * @param  GetPaid_Data  $object GetPaid_Data object.
-	 * @param  stdClass $meta (containing at least ->id).
-	 */
-	public function delete_meta( &$object, $meta ) {
-		delete_metadata_by_mid( $this->meta_type, $meta->id );
-	}
-
-	/**
-	 * Add new piece of meta.
-	 *
-	 * @since  1.0.19
-	 * @param  GetPaid_Data  $object GetPaid_Data object.
-	 * @param  stdClass $meta (containing ->key and ->value).
-	 * @return int meta ID
-	 */
-	public function add_meta( &$object, $meta ) {
-		return add_metadata( $this->meta_type, $object->get_id(), $meta->key, is_string( $meta->value ) ? wp_slash( $meta->value ) : $meta->value, false );
-	}
-
-	/**
-	 * Update meta.
-	 *
-	 * @since  1.0.19
-	 * @param  GetPaid_Data  $object GetPaid_Data object.
-	 * @param  stdClass $meta (containing ->id, ->key and ->value).
-	 */
-	public function update_meta( &$object, $meta ) {
-		update_metadata_by_mid( $this->meta_type, $meta->id, $meta->value, $meta->key );
-	}
-
-	/**
-	 * Table structure is slightly different between meta types, this function will return what we need to know.
-	 *
-	 * @since  1.0.19
-	 * @return array Array elements: table, object_id_field, meta_id_field
-	 */
-	protected function get_db_info() {
-		global $wpdb;
-
-		$meta_id_field = 'meta_id'; // for some reason users calls this umeta_id so we need to track this as well.
-		$table         = $wpdb->prefix;
-
-		// If we are dealing with a type of metadata that is not a core type, the table should be prefixed.
-		if ( ! in_array( $this->meta_type, array( 'post', 'user', 'comment', 'term' ), true ) ) {
-			$table .= 'getpaid_';
-		}
-
-		$table          .= $this->meta_type . 'meta';
-		$object_id_field = $this->meta_type . '_id';
-
-		// Figure out our field names.
-		if ( 'user' === $this->meta_type ) {
-			$meta_id_field = 'umeta_id';
-			$table         = $wpdb->usermeta;
-		}
-
-		if ( ! empty( $this->object_id_field_for_meta ) ) {
-			$object_id_field = $this->object_id_field_for_meta;
-		}
-
-		return array(
-			'table'           => $table,
-			'object_id_field' => $object_id_field,
-			'meta_id_field'   => $meta_id_field,
-		);
-	}
-
-	/**
-	 * Internal meta keys we don't want exposed as part of meta_data. This is in
-	 * addition to all data props with _ prefix.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $key Prefix to be added to meta keys.
-	 * @return string
-	 */
-	protected function prefix_key( $key ) {
-		return '_' === substr( $key, 0, 1 ) ? $key : '_' . $key;
-	}
-
-	/**
-	 * Callback to remove unwanted meta data.
-	 *
-	 * @param object $meta Meta object to check if it should be excluded or not.
-	 * @return bool
-	 */
-	protected function exclude_internal_meta_keys( $meta ) {
-		return ! in_array( $meta->meta_key, $this->internal_meta_keys, true ) && 0 !== stripos( $meta->meta_key, 'wp_' );
-	}
-
-	/**
-	 * Gets a list of props and meta keys that need updated based on change state
-	 * or if they are present in the database or not.
-	 *
-	 * @param  GetPaid_Data $object         The GetPaid_Data object.
-	 * @param  array   $meta_key_to_props   A mapping of meta keys => prop names.
-	 * @param  string  $meta_type           The internal WP meta type (post, user, etc).
-	 * @return array                        A mapping of meta keys => prop names, filtered by ones that should be updated.
-	 */
-	protected function get_props_to_update( $object, $meta_key_to_props, $meta_type = 'post' ) {
-		$props_to_update = array();
-		$changed_props   = $object->get_changes();
-
-		// Props should be updated if they are a part of the $changed array or don't exist yet.
-		foreach ( $meta_key_to_props as $meta_key => $prop ) {
-			if ( array_key_exists( $prop, $changed_props ) || ! metadata_exists( $meta_type, $object->get_id(), $meta_key ) ) {
-				$props_to_update[ $meta_key ] = $prop;
-			}
-		}
-
-		return $props_to_update;
-	}
-
-	/**
-	 * Update meta data in, or delete it from, the database.
-	 *
-	 * Avoids storing meta when it's either an empty string or empty array or null.
-	 * Other empty values such as numeric 0 should still be stored.
-	 * Data-stores can force meta to exist using `must_exist_meta_keys`.
-	 *
-	 * Note: WordPress `get_metadata` function returns an empty string when meta data does not exist.
-	 *
-	 * @param GetPaid_Data $object The GetPaid_Data object.
-	 * @param string  $meta_key Meta key to update.
-	 * @param mixed   $meta_value Value to save.
-	 *
-	 * @since 1.0.19 Added to prevent empty meta being stored unless required.
-	 *
-	 * @return bool True if updated/deleted.
-	 */
-	protected function update_or_delete_post_meta( $object, $meta_key, $meta_value ) {
-		if ( in_array( $meta_value, array( array(), '', null ), true ) && ! in_array( $meta_key, $this->must_exist_meta_keys, true ) ) {
-			$updated = delete_post_meta( $object->get_id(), $meta_key );
-		} else {
-			$updated = update_post_meta( $object->get_id(), $meta_key, $meta_value );
-		}
-
-		return (bool) $updated;
-	}
-
-	/**
-	 * Return list of internal meta keys.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_internal_meta_keys() {
-		return $this->internal_meta_keys;
-	}
+                $object->get_id()
+            )
+        );
+
+        $this->internal_meta_keys = array_merge( array_map( array( $this, 'prefix_key' ), $object->get_data_keys() ), $this->internal_meta_keys );
+        $meta_data                = array_filter( $raw_meta_data, array( $this, 'exclude_internal_meta_keys' ) );
+        return apply_filters( "getpaid_data_store_wp_{$this->meta_type}_read_meta", $meta_data, $object, $this );
+    }
+
+    /**
+     * Deletes meta based on meta ID.
+     *
+     * @since  1.0.19
+     * @param  GetPaid_Data  $object GetPaid_Data object.
+     * @param  stdClass $meta (containing at least ->id).
+     */
+    public function delete_meta( &$object, $meta ) {
+        delete_metadata_by_mid( $this->meta_type, $meta->id );
+    }
+
+    /**
+     * Add new piece of meta.
+     *
+     * @since  1.0.19
+     * @param  GetPaid_Data  $object GetPaid_Data object.
+     * @param  stdClass $meta (containing ->key and ->value).
+     * @return int meta ID
+     */
+    public function add_meta( &$object, $meta ) {
+        return add_metadata( $this->meta_type, $object->get_id(), $meta->key, is_string( $meta->value ) ? wp_slash( $meta->value ) : $meta->value, false );
+    }
+
+    /**
+     * Update meta.
+     *
+     * @since  1.0.19
+     * @param  GetPaid_Data  $object GetPaid_Data object.
+     * @param  stdClass $meta (containing ->id, ->key and ->value).
+     */
+    public function update_meta( &$object, $meta ) {
+        update_metadata_by_mid( $this->meta_type, $meta->id, $meta->value, $meta->key );
+    }
+
+    /**
+     * Table structure is slightly different between meta types, this function will return what we need to know.
+     *
+     * @since  1.0.19
+     * @return array Array elements: table, object_id_field, meta_id_field
+     */
+    protected function get_db_info() {
+        global $wpdb;
+
+        $meta_id_field = 'meta_id'; // for some reason users calls this umeta_id so we need to track this as well.
+        $table         = $wpdb->prefix;
+
+        // If we are dealing with a type of metadata that is not a core type, the table should be prefixed.
+        if ( ! in_array( $this->meta_type, array( 'post', 'user', 'comment', 'term' ), true ) ) {
+            $table .= 'getpaid_';
+        }
+
+        $table          .= $this->meta_type . 'meta';
+        $object_id_field = $this->meta_type . '_id';
+
+        // Figure out our field names.
+        if ( 'user' === $this->meta_type ) {
+            $meta_id_field = 'umeta_id';
+            $table         = $wpdb->usermeta;
+        }
+
+        if ( ! empty( $this->object_id_field_for_meta ) ) {
+            $object_id_field = $this->object_id_field_for_meta;
+        }
+
+        return array(
+            'table'           => $table,
+            'object_id_field' => $object_id_field,
+            'meta_id_field'   => $meta_id_field,
+        );
+    }
+
+    /**
+     * Internal meta keys we don't want exposed as part of meta_data. This is in
+     * addition to all data props with _ prefix.
+     *
+     * @since 1.0.19
+     *
+     * @param string $key Prefix to be added to meta keys.
+     * @return string
+     */
+    protected function prefix_key( $key ) {
+        return '_' === substr( $key, 0, 1 ) ? $key : '_' . $key;
+    }
+
+    /**
+     * Callback to remove unwanted meta data.
+     *
+     * @param object $meta Meta object to check if it should be excluded or not.
+     * @return bool
+     */
+    protected function exclude_internal_meta_keys( $meta ) {
+        return ! in_array( $meta->meta_key, $this->internal_meta_keys, true ) && 0 !== stripos( $meta->meta_key, 'wp_' );
+    }
+
+    /**
+     * Gets a list of props and meta keys that need updated based on change state
+     * or if they are present in the database or not.
+     *
+     * @param  GetPaid_Data $object         The GetPaid_Data object.
+     * @param  array   $meta_key_to_props   A mapping of meta keys => prop names.
+     * @param  string  $meta_type           The internal WP meta type (post, user, etc).
+     * @return array                        A mapping of meta keys => prop names, filtered by ones that should be updated.
+     */
+    protected function get_props_to_update( $object, $meta_key_to_props, $meta_type = 'post' ) {
+        $props_to_update = array();
+        $changed_props   = $object->get_changes();
+
+        // Props should be updated if they are a part of the $changed array or don't exist yet.
+        foreach ( $meta_key_to_props as $meta_key => $prop ) {
+            if ( array_key_exists( $prop, $changed_props ) || ! metadata_exists( $meta_type, $object->get_id(), $meta_key ) ) {
+                $props_to_update[ $meta_key ] = $prop;
+            }
+        }
+
+        return $props_to_update;
+    }
+
+    /**
+     * Update meta data in, or delete it from, the database.
+     *
+     * Avoids storing meta when it's either an empty string or empty array or null.
+     * Other empty values such as numeric 0 should still be stored.
+     * Data-stores can force meta to exist using `must_exist_meta_keys`.
+     *
+     * Note: WordPress `get_metadata` function returns an empty string when meta data does not exist.
+     *
+     * @param GetPaid_Data $object The GetPaid_Data object.
+     * @param string  $meta_key Meta key to update.
+     * @param mixed   $meta_value Value to save.
+     *
+     * @since 1.0.19 Added to prevent empty meta being stored unless required.
+     *
+     * @return bool True if updated/deleted.
+     */
+    protected function update_or_delete_post_meta( $object, $meta_key, $meta_value ) {
+        if ( in_array( $meta_value, array( array(), '', null ), true ) && ! in_array( $meta_key, $this->must_exist_meta_keys, true ) ) {
+            $updated = delete_post_meta( $object->get_id(), $meta_key );
+        } else {
+            $updated = update_post_meta( $object->get_id(), $meta_key, $meta_value );
+        }
+
+        return (bool) $updated;
+    }
+
+    /**
+     * Return list of internal meta keys.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_internal_meta_keys() {
+        return $this->internal_meta_keys;
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -5,7 +5,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Data_Store_WP class.
@@ -53,7 +53,7 @@ 
 	 * @param  GetPaid_Data $object GetPaid_Data object.
 	 * @return array
 	 */
-	public function read_meta( &$object ) {
+	public function read_meta(&$object) {
 		global $wpdb;
 		$db_info       = $this->get_db_info();
 		$raw_meta_data = $wpdb->get_results(
@@ -66,9 +66,9 @@ 
 			)
 		);
 
-		$this->internal_meta_keys = array_merge( array_map( array( $this, 'prefix_key' ), $object->get_data_keys() ), $this->internal_meta_keys );
-		$meta_data                = array_filter( $raw_meta_data, array( $this, 'exclude_internal_meta_keys' ) );
-		return apply_filters( "getpaid_data_store_wp_{$this->meta_type}_read_meta", $meta_data, $object, $this );
+		$this->internal_meta_keys = array_merge(array_map(array($this, 'prefix_key'), $object->get_data_keys()), $this->internal_meta_keys);
+		$meta_data                = array_filter($raw_meta_data, array($this, 'exclude_internal_meta_keys'));
+		return apply_filters("getpaid_data_store_wp_{$this->meta_type}_read_meta", $meta_data, $object, $this);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 * @param  GetPaid_Data  $object GetPaid_Data object.
 	 * @param  stdClass $meta (containing at least ->id).
 	 */
-	public function delete_meta( &$object, $meta ) {
-		delete_metadata_by_mid( $this->meta_type, $meta->id );
+	public function delete_meta(&$object, $meta) {
+		delete_metadata_by_mid($this->meta_type, $meta->id);
 	}
 
 	/**
@@ -90,8 +90,8 @@ 
 	 * @param  stdClass $meta (containing ->key and ->value).
 	 * @return int meta ID
 	 */
-	public function add_meta( &$object, $meta ) {
-		return add_metadata( $this->meta_type, $object->get_id(), $meta->key, is_string( $meta->value ) ? wp_slash( $meta->value ) : $meta->value, false );
+	public function add_meta(&$object, $meta) {
+		return add_metadata($this->meta_type, $object->get_id(), $meta->key, is_string($meta->value) ? wp_slash($meta->value) : $meta->value, false);
 	}
 
 	/**
@@ -101,8 +101,8 @@ 
 	 * @param  GetPaid_Data  $object GetPaid_Data object.
 	 * @param  stdClass $meta (containing ->id, ->key and ->value).
 	 */
-	public function update_meta( &$object, $meta ) {
-		update_metadata_by_mid( $this->meta_type, $meta->id, $meta->value, $meta->key );
+	public function update_meta(&$object, $meta) {
+		update_metadata_by_mid($this->meta_type, $meta->id, $meta->value, $meta->key);
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 		$table         = $wpdb->prefix;
 
 		// If we are dealing with a type of metadata that is not a core type, the table should be prefixed.
-		if ( ! in_array( $this->meta_type, array( 'post', 'user', 'comment', 'term' ), true ) ) {
+		if (!in_array($this->meta_type, array('post', 'user', 'comment', 'term'), true)) {
 			$table .= 'getpaid_';
 		}
 
@@ -126,12 +126,12 @@ 
 		$object_id_field = $this->meta_type . '_id';
 
 		// Figure out our field names.
-		if ( 'user' === $this->meta_type ) {
+		if ('user' === $this->meta_type) {
 			$meta_id_field = 'umeta_id';
 			$table         = $wpdb->usermeta;
 		}
 
-		if ( ! empty( $this->object_id_field_for_meta ) ) {
+		if (!empty($this->object_id_field_for_meta)) {
 			$object_id_field = $this->object_id_field_for_meta;
 		}
 
@@ -151,8 +151,8 @@ 
 	 * @param string $key Prefix to be added to meta keys.
 	 * @return string
 	 */
-	protected function prefix_key( $key ) {
-		return '_' === substr( $key, 0, 1 ) ? $key : '_' . $key;
+	protected function prefix_key($key) {
+		return '_' === substr($key, 0, 1) ? $key : '_' . $key;
 	}
 
 	/**
@@ -161,8 +161,8 @@ 
 	 * @param object $meta Meta object to check if it should be excluded or not.
 	 * @return bool
 	 */
-	protected function exclude_internal_meta_keys( $meta ) {
-		return ! in_array( $meta->meta_key, $this->internal_meta_keys, true ) && 0 !== stripos( $meta->meta_key, 'wp_' );
+	protected function exclude_internal_meta_keys($meta) {
+		return !in_array($meta->meta_key, $this->internal_meta_keys, true) && 0 !== stripos($meta->meta_key, 'wp_');
 	}
 
 	/**
@@ -174,14 +174,14 @@ 
 	 * @param  string  $meta_type           The internal WP meta type (post, user, etc).
 	 * @return array                        A mapping of meta keys => prop names, filtered by ones that should be updated.
 	 */
-	protected function get_props_to_update( $object, $meta_key_to_props, $meta_type = 'post' ) {
+	protected function get_props_to_update($object, $meta_key_to_props, $meta_type = 'post') {
 		$props_to_update = array();
 		$changed_props   = $object->get_changes();
 
 		// Props should be updated if they are a part of the $changed array or don't exist yet.
-		foreach ( $meta_key_to_props as $meta_key => $prop ) {
-			if ( array_key_exists( $prop, $changed_props ) || ! metadata_exists( $meta_type, $object->get_id(), $meta_key ) ) {
-				$props_to_update[ $meta_key ] = $prop;
+		foreach ($meta_key_to_props as $meta_key => $prop) {
+			if (array_key_exists($prop, $changed_props) || !metadata_exists($meta_type, $object->get_id(), $meta_key)) {
+				$props_to_update[$meta_key] = $prop;
 			}
 		}
 
@@ -205,11 +205,11 @@ 
 	 *
 	 * @return bool True if updated/deleted.
 	 */
-	protected function update_or_delete_post_meta( $object, $meta_key, $meta_value ) {
-		if ( in_array( $meta_value, array( array(), '', null ), true ) && ! in_array( $meta_key, $this->must_exist_meta_keys, true ) ) {
-			$updated = delete_post_meta( $object->get_id(), $meta_key );
+	protected function update_or_delete_post_meta($object, $meta_key, $meta_value) {
+		if (in_array($meta_value, array(array(), '', null), true) && !in_array($meta_key, $this->must_exist_meta_keys, true)) {
+			$updated = delete_post_meta($object->get_id(), $meta_key);
 		} else {
-			$updated = update_post_meta( $object->get_id(), $meta_key, $meta_value );
+			$updated = update_post_meta($object->get_id(), $meta_key, $meta_value);
 		}
 
 		return (bool) $updated;

includes/data-stores/class-getpaid-meta-data.php

Indentation +91 added lines, -91 removed lines

@@ -15,104 +15,104 @@
  */
 class GetPaid_Meta_Data implements JsonSerializable {
 
-	/**
-	 * Current data for metadata
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $current_data;
+    /**
+     * Current data for metadata
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $current_data;
 
-	/**
-	 * Metadata data
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data;
+    /**
+     * Metadata data
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param array $meta Data to wrap behind this function.
-	 */
-	public function __construct( $meta = array() ) {
-		$this->current_data = $meta;
-		$this->apply_changes();
-	}
+    /**
+     * Constructor.
+     *
+     * @param array $meta Data to wrap behind this function.
+     */
+    public function __construct( $meta = array() ) {
+        $this->current_data = $meta;
+        $this->apply_changes();
+    }
 
-	/**
-	 * When converted to JSON.
-	 *
-	 * @return object|array
-	 */
-	public function jsonSerialize() {
-		return $this->get_data();
-	}
+    /**
+     * When converted to JSON.
+     *
+     * @return object|array
+     */
+    public function jsonSerialize() {
+        return $this->get_data();
+    }
 
-	/**
-	 * Merge changes with data and clear.
-	 */
-	public function apply_changes() {
-		$this->data = $this->current_data;
-	}
+    /**
+     * Merge changes with data and clear.
+     */
+    public function apply_changes() {
+        $this->data = $this->current_data;
+    }
 
-	/**
-	 * Creates or updates a property in the metadata object.
-	 *
-	 * @param string $key Key to set.
-	 * @param mixed  $value Value to set.
-	 */
-	public function __set( $key, $value ) {
-		$this->current_data[ $key ] = $value;
-	}
+    /**
+     * Creates or updates a property in the metadata object.
+     *
+     * @param string $key Key to set.
+     * @param mixed  $value Value to set.
+     */
+    public function __set( $key, $value ) {
+        $this->current_data[ $key ] = $value;
+    }
 
-	/**
-	 * Checks if a given key exists in our data. This is called internally
-	 * by `empty` and `isset`.
-	 *
-	 * @param string $key Key to check if set.
-	 *
-	 * @return bool
-	 */
-	public function __isset( $key ) {
-		return array_key_exists( $key, $this->current_data );
-	}
+    /**
+     * Checks if a given key exists in our data. This is called internally
+     * by `empty` and `isset`.
+     *
+     * @param string $key Key to check if set.
+     *
+     * @return bool
+     */
+    public function __isset( $key ) {
+        return array_key_exists( $key, $this->current_data );
+    }
 
-	/**
-	 * Returns the value of any property.
-	 *
-	 * @param string $key Key to get.
-	 * @return mixed Property value or NULL if it does not exists
-	 */
-	public function __get( $key ) {
-		if ( array_key_exists( $key, $this->current_data ) ) {
-			return $this->current_data[ $key ];
-		}
-		return null;
-	}
+    /**
+     * Returns the value of any property.
+     *
+     * @param string $key Key to get.
+     * @return mixed Property value or NULL if it does not exists
+     */
+    public function __get( $key ) {
+        if ( array_key_exists( $key, $this->current_data ) ) {
+            return $this->current_data[ $key ];
+        }
+        return null;
+    }
 
-	/**
-	 * Return data changes only.
-	 *
-	 * @return array
-	 */
-	public function get_changes() {
-		$changes = array();
-		foreach ( $this->current_data as $id => $value ) {
-			if ( ! array_key_exists( $id, $this->data ) || $value !== $this->data[ $id ] ) {
-				$changes[ $id ] = $value;
-			}
-		}
-		return $changes;
-	}
+    /**
+     * Return data changes only.
+     *
+     * @return array
+     */
+    public function get_changes() {
+        $changes = array();
+        foreach ( $this->current_data as $id => $value ) {
+            if ( ! array_key_exists( $id, $this->data ) || $value !== $this->data[ $id ] ) {
+                $changes[ $id ] = $value;
+            }
+        }
+        return $changes;
+    }
 
-	/**
-	 * Return all data as an array.
-	 *
-	 * @return array
-	 */
-	public function get_data() {
-		return $this->data;
-	}
+    /**
+     * Return all data as an array.
+     *
+     * @return array
+     */
+    public function get_data() {
+        return $this->data;
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Meta data class.
@@ -36,7 +36,7 @@ 
 	 *
 	 * @param array $meta Data to wrap behind this function.
 	 */
-	public function __construct( $meta = array() ) {
+	public function __construct($meta = array()) {
 		$this->current_data = $meta;
 		$this->apply_changes();
 	}
@@ -63,8 +63,8 @@ 
 	 * @param string $key Key to set.
 	 * @param mixed  $value Value to set.
 	 */
-	public function __set( $key, $value ) {
-		$this->current_data[ $key ] = $value;
+	public function __set($key, $value) {
+		$this->current_data[$key] = $value;
 	}
 
 	/**
@@ -75,8 +75,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		return array_key_exists( $key, $this->current_data );
+	public function __isset($key) {
+		return array_key_exists($key, $this->current_data);
 	}
 
 	/**
@@ -85,9 +85,9 @@ 
 	 * @param string $key Key to get.
 	 * @return mixed Property value or NULL if it does not exists
 	 */
-	public function __get( $key ) {
-		if ( array_key_exists( $key, $this->current_data ) ) {
-			return $this->current_data[ $key ];
+	public function __get($key) {
+		if (array_key_exists($key, $this->current_data)) {
+			return $this->current_data[$key];
 		}
 		return null;
 	}
@@ -99,9 +99,9 @@ 
 	 */
 	public function get_changes() {
 		$changes = array();
-		foreach ( $this->current_data as $id => $value ) {
-			if ( ! array_key_exists( $id, $this->data ) || $value !== $this->data[ $id ] ) {
-				$changes[ $id ] = $value;
+		foreach ($this->current_data as $id => $value) {
+			if (!array_key_exists($id, $this->data) || $value !== $this->data[$id]) {
+				$changes[$id] = $value;
 			}
 		}
 		return $changes;

includes/wpinv-tax-functions.php

Spacing +172 added lines, -172 removed lines

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

vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php

Indentation +18 added lines, -18 removed lines

@@ -7,40 +7,40 @@
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
-	$this_version = "0.1.18";
-	if(version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
-	}
+    global $ayecode_ui_version,$ayecode_ui_file_key;
+    $this_version = "0.1.18";
+    if(version_compare($this_version , $ayecode_ui_version, '>')){
+        $ayecode_ui_version = $this_version ;
+        $ayecode_ui_file_key = wp_hash( __FILE__ );
+    }
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
-	}
+    global $ayecode_ui_file_key;
+    if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
+        include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
+        include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+    }
 },1);
 
 /**
  * Add the function that calls the class.
  */
 if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
-			return false;
-		}
-		return AUI::instance();
-	}
+    function aui(){
+        if(!class_exists("AUI",false)){
+            return false;
+        }
+        return AUI::instance();
+    }
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -6,39 +6,39 @@
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
-add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
+add_action('after_setup_theme', function() {
+	global $ayecode_ui_version, $ayecode_ui_file_key;
 	$this_version = "0.1.18";
-	if(version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
+	if (version_compare($this_version, $ayecode_ui_version, '>')) {
+		$ayecode_ui_version = $this_version;
+		$ayecode_ui_file_key = wp_hash(__FILE__);
 	}
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
-add_action('after_setup_theme', function () {
+add_action('after_setup_theme', function() {
 	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+	if ($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash(__FILE__)) {
+		include_once(dirname(__FILE__) . '/includes/class-aui.php');
+		include_once(dirname(__FILE__) . '/includes/ayecode-ui-settings.php');
 	}
 },1);
 
 /**
  * Add the function that calls the class.
  */
-if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
+if (!function_exists('aui')) {
+	function aui() {
+		if (!class_exists("AUI", false)) {
 			return false;
 		}
 		return AUI::instance();