AyeCode / invoicing

includes/class-wpinv-legacy-invoice.php

Indentation +19 added lines, -19 removed lines

@@ -775,10 +775,10 @@ 
         $allowed_fee_keys = apply_filters(
             'wpinv_fee_keys',
             array(
-				'index',
-				'label',
-				'amount',
-				'type',
+                'index',
+                'label',
+                'amount',
+                'type',
             )
         );
 
@@ -850,19 +850,19 @@ 
         $note_id = wp_insert_comment(
             wp_filter_comment(
                 array(
-					'comment_post_ID'      => $this->ID,
-					'comment_content'      => $note,
-					'comment_agent'        => 'WPInvoicing',
-					'user_id'              => is_admin() ? get_current_user_id() : 0,
-					'comment_date'         => current_time( 'mysql' ),
-					'comment_date_gmt'     => current_time( 'mysql', 1 ),
-					'comment_approved'     => 1,
-					'comment_parent'       => 0,
-					'comment_author'       => $comment_author,
-					'comment_author_IP'    => wpinv_get_ip(),
-					'comment_author_url'   => '',
-					'comment_author_email' => $comment_author_email,
-					'comment_type'         => 'wpinv_note',
+                    'comment_post_ID'      => $this->ID,
+                    'comment_content'      => $note,
+                    'comment_agent'        => 'WPInvoicing',
+                    'user_id'              => is_admin() ? get_current_user_id() : 0,
+                    'comment_date'         => current_time( 'mysql' ),
+                    'comment_date_gmt'     => current_time( 'mysql', 1 ),
+                    'comment_approved'     => 1,
+                    'comment_parent'       => 0,
+                    'comment_author'       => $comment_author,
+                    'comment_author_IP'    => wpinv_get_ip(),
+                    'comment_author_url'   => '',
+                    'comment_author_email' => $comment_author_email,
+                    'comment_type'         => 'wpinv_note',
                 )
             )
         );
@@ -875,8 +875,8 @@ 
             do_action(
                 'wpinv_new_customer_note',
                 array(
-					'invoice_id' => $this->ID,
-					'user_note'  => $note,
+                    'invoice_id' => $this->ID,
+                    'user_note'  => $note,
                 )
             );
         }

Spacing +292 added lines, -292 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // MUST have WordPress.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
@@ -19,7 +19,7 @@ 
     /**
      * Invoice id.
      */
-    public $ID  = 0;
+    public $ID = 0;
 
     /**
      * The title of the invoice. Usually the invoice number.
@@ -135,7 +135,7 @@ 
     /**
      * The invoice status.
      */
-    public $status      = 'wpi-pending';
+    public $status = 'wpi-pending';
 
     /**
      * Same as self::$status.
@@ -262,17 +262,17 @@ 
      */
     public $parent_invoice = 0;
 
-    public function __construct( $invoice_id = false ) {
-        if ( empty( $invoice_id ) ) {
+    public function __construct($invoice_id = false) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $this->setup_invoice( $invoice_id );
+        $this->setup_invoice($invoice_id);
     }
 
-    public function get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            $value = call_user_func( array( $this, 'get_' . $key ) );
+    public function get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            $value = call_user_func(array($this, 'get_' . $key));
         } else {
             $value = $this->$key;
         }
@@ -280,43 +280,43 @@ 
         return $value;
     }
 
-    public function set( $key, $value ) {
-        $ignore = array( 'items', 'cart_details', 'fees', '_ID' );
+    public function set($key, $value) {
+        $ignore = array('items', 'cart_details', 'fees', '_ID');
 
-        if ( $key === 'status' ) {
+        if ($key === 'status') {
             $this->old_status = $this->status;
         }
 
-        if ( ! in_array( $key, $ignore ) ) {
-            $this->pending[ $key ] = $value;
+        if (!in_array($key, $ignore)) {
+            $this->pending[$key] = $value;
         }
 
-        if ( '_ID' !== $key ) {
+        if ('_ID' !== $key) {
             $this->$key = $value;
         }
     }
 
-    public function _isset( $name ) {
-        if ( property_exists( $this, $name ) ) {
-            return false === empty( $this->$name );
+    public function _isset($name) {
+        if (property_exists($this, $name)) {
+            return false === empty($this->$name);
         } else {
             return null;
         }
     }
 
-    private function setup_invoice( $invoice_id ) {
+    private function setup_invoice($invoice_id) {
         $this->pending = array();
 
-        $invoice = get_post( $invoice_id );
+        $invoice = get_post($invoice_id);
 
-        if ( ! $invoice || is_wp_error( $invoice ) ) {
+        if (!$invoice || is_wp_error($invoice)) {
             return false;
         }
 
-        do_action( 'wpinv_pre_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_pre_setup_invoice', $this, $invoice_id);
 
         // Primary Identifier
-        $this->ID              = absint( $invoice_id );
+        $this->ID              = absint($invoice_id);
         $this->post_type       = $invoice->post_type;
 
         // We have a payment, get the generic payment_meta item to reduce calls to it
@@ -326,15 +326,15 @@ 
         $this->completed_date  = $this->setup_completed_date();
         $this->status          = $invoice->post_status;
 
-        if ( 'future' == $this->status ) {
+        if ('future' == $this->status) {
             $this->status = 'publish';
         }
 
         $this->post_status     = $this->status;
         $this->mode            = $this->setup_mode();
         $this->parent_invoice  = $invoice->post_parent;
-        $this->post_name       = $this->setup_post_name( $invoice );
-        $this->status_nicename = $this->setup_status_nicename( $invoice->post_status );
+        $this->post_name       = $this->setup_post_name($invoice);
+        $this->status_nicename = $this->setup_status_nicename($invoice->post_status);
 
         // Items
         $this->fees            = $this->setup_fees();
@@ -356,8 +356,8 @@ 
 
         // User based
         $this->ip              = $this->setup_ip();
-        $this->user_id         = ! empty( $invoice->post_author ) ? $invoice->post_author : get_current_user_id();///$this->setup_user_id();
-        $this->email           = get_the_author_meta( 'email', $this->user_id );
+        $this->user_id         = !empty($invoice->post_author) ? $invoice->post_author : get_current_user_id(); ///$this->setup_user_id();
+        $this->email           = get_the_author_meta('email', $this->user_id);
 
         $this->user_info       = $this->setup_user_info();
 
@@ -366,7 +366,7 @@ 
         $this->company         = $this->user_info['company'];
         $this->vat_number      = $this->user_info['vat_number'];
         $this->vat_rate        = $this->user_info['vat_rate'];
-        $this->adddress_confirmed  = $this->user_info['adddress_confirmed'];
+        $this->adddress_confirmed = $this->user_info['adddress_confirmed'];
         $this->address         = $this->user_info['address'];
         $this->city            = $this->user_info['city'];
         $this->country         = $this->user_info['country'];
@@ -381,31 +381,31 @@ 
         // Other Identifiers
         $this->key             = $this->setup_invoice_key();
         $this->number          = $this->setup_invoice_number();
-        $this->title           = ! empty( $invoice->post_title ) ? $invoice->post_title : $this->number;
+        $this->title           = !empty($invoice->post_title) ? $invoice->post_title : $this->number;
 
-        $this->full_name       = trim( $this->first_name . ' ' . $this->last_name );
+        $this->full_name       = trim($this->first_name . ' ' . $this->last_name);
 
         // Allow extensions to add items to this object via hook
-        do_action( 'wpinv_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_setup_invoice', $this, $invoice_id);
 
         return true;
     }
 
-    private function setup_status_nicename( $status ) {
+    private function setup_status_nicename($status) {
         return $status;
     }
 
-    private function setup_post_name( $post ) {
+    private function setup_post_name($post) {
         $this->post_name = $post->post_name;
     }
 
     private function setup_due_date() {
-        $due_date = $this->get_meta( '_wpinv_due_date' );
+        $due_date = $this->get_meta('_wpinv_due_date');
 
-        if ( empty( $due_date ) ) {
-            $overdue_time = strtotime( $this->date ) + ( DAY_IN_SECONDS * absint( wpinv_get_option( 'overdue_days', 0 ) ) );
-            $due_date = date_i18n( 'Y-m-d', $overdue_time );
-        } elseif ( $due_date == 'none' ) {
+        if (empty($due_date)) {
+            $overdue_time = strtotime($this->date) + (DAY_IN_SECONDS * absint(wpinv_get_option('overdue_days', 0)));
+            $due_date = date_i18n('Y-m-d', $overdue_time);
+        } elseif ($due_date == 'none') {
             $due_date = '';
         }
 
@@ -413,67 +413,67 @@ 
     }
 
     private function setup_completed_date() {
-        $invoice = get_post( $this->ID );
+        $invoice = get_post($this->ID);
 
-        if ( 'wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status ) {
+        if ('wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status) {
             return false; // This invoice was never paid
         }
 
-        $date = ( $date = $this->get_meta( '_wpinv_completed_date', true ) ) ? $date : $invoice->modified_date;
+        $date = ($date = $this->get_meta('_wpinv_completed_date', true)) ? $date : $invoice->modified_date;
 
         return $date;
     }
 
     private function setup_cart_details() {
-        $cart_details = isset( $this->payment_meta['cart_details'] ) ? maybe_unserialize( $this->payment_meta['cart_details'] ) : array();
+        $cart_details = isset($this->payment_meta['cart_details']) ? maybe_unserialize($this->payment_meta['cart_details']) : array();
         return $cart_details;
     }
 
     public function array_convert() {
-        return get_object_vars( $this );
+        return get_object_vars($this);
     }
 
     private function setup_items() {
-        $items = isset( $this->payment_meta['items'] ) ? maybe_unserialize( $this->payment_meta['items'] ) : array();
+        $items = isset($this->payment_meta['items']) ? maybe_unserialize($this->payment_meta['items']) : array();
         return $items;
     }
 
     private function setup_fees() {
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
         return $payment_fees;
     }
 
     private function setup_currency() {
-        $currency = isset( $this->payment_meta['currency'] ) ? $this->payment_meta['currency'] : apply_filters( 'wpinv_currency_default', wpinv_get_currency(), $this );
+        $currency = isset($this->payment_meta['currency']) ? $this->payment_meta['currency'] : apply_filters('wpinv_currency_default', wpinv_get_currency(), $this);
         return $currency;
     }
 
     private function setup_discount() {
         //$discount = $this->get_meta( '_wpinv_discount', true );
-        $discount = (float)$this->subtotal - ( (float)$this->total - (float)$this->tax - (float)$this->fees_total );
-        if ( $discount < 0 ) {
+        $discount = (float) $this->subtotal - ((float) $this->total - (float) $this->tax - (float) $this->fees_total);
+        if ($discount < 0) {
             $discount = 0;
         }
-        $discount = wpinv_round_amount( $discount );
+        $discount = wpinv_round_amount($discount);
 
         return $discount;
     }
 
     private function setup_discount_code() {
-        $discount_code = ! empty( $this->discounts ) ? $this->discounts : $this->get_meta( '_wpinv_discount_code', true );
+        $discount_code = !empty($this->discounts) ? $this->discounts : $this->get_meta('_wpinv_discount_code', true);
         return $discount_code;
     }
 
     private function setup_tax() {
 
-        $tax = $this->get_meta( '_wpinv_tax', true );
+        $tax = $this->get_meta('_wpinv_tax', true);
 
         // We don't have tax as it's own meta and no meta was passed
-        if ( '' === $tax ) {
-            $tax = isset( $this->payment_meta['tax'] ) ? $this->payment_meta['tax'] : 0;
+        if ('' === $tax) {
+            $tax = isset($this->payment_meta['tax']) ? $this->payment_meta['tax'] : 0;
         }
 
-        if ( $tax < 0 || ! $this->is_taxable() ) {
+        if ($tax < 0 || !$this->is_taxable()) {
             $tax = 0;
         }
 
@@ -484,16 +484,16 @@ 
      * If taxes are enabled, allow users to enable/disable taxes per invoice.
      */
     private function setup_is_taxable() {
-        return (int) $this->get_meta( '_wpinv_disable_taxes', true );
+        return (int) $this->get_meta('_wpinv_disable_taxes', true);
     }
 
     private function setup_subtotal() {
         $subtotal     = 0;
         $cart_details = $this->cart_details;
 
-        if ( is_array( $cart_details ) ) {
-            foreach ( $cart_details as $item ) {
-                if ( isset( $item['subtotal'] ) ) {
+        if (is_array($cart_details)) {
+            foreach ($cart_details as $item) {
+                if (isset($item['subtotal'])) {
                     $subtotal += $item['subtotal'];
                 }
             }
@@ -507,23 +507,23 @@ 
     }
 
     private function setup_discounts() {
-        $discounts = ! empty( $this->payment_meta['user_info']['discount'] ) ? $this->payment_meta['user_info']['discount'] : array();
+        $discounts = !empty($this->payment_meta['user_info']['discount']) ? $this->payment_meta['user_info']['discount'] : array();
         return $discounts;
     }
 
     private function setup_total() {
-        $amount = $this->get_meta( '_wpinv_total', true );
+        $amount = $this->get_meta('_wpinv_total', true);
 
-        if ( empty( $amount ) && '0.00' != $amount ) {
-            $meta   = $this->get_meta( '_wpinv_payment_meta', true );
-            $meta   = maybe_unserialize( $meta );
+        if (empty($amount) && '0.00' != $amount) {
+            $meta   = $this->get_meta('_wpinv_payment_meta', true);
+            $meta   = maybe_unserialize($meta);
 
-            if ( isset( $meta['amount'] ) ) {
+            if (isset($meta['amount'])) {
                 $amount = $meta['amount'];
             }
         }
 
-        if ( $amount < 0 ) {
+        if ($amount < 0) {
             $amount = 0;
         }
 
@@ -531,13 +531,13 @@ 
     }
 
     private function setup_mode() {
-        return $this->get_meta( '_wpinv_mode' );
+        return $this->get_meta('_wpinv_mode');
     }
 
     private function setup_gateway() {
-        $gateway = $this->get_meta( '_wpinv_gateway' );
+        $gateway = $this->get_meta('_wpinv_gateway');
 
-        if ( empty( $gateway ) && 'publish' === $this->status ) {
+        if (empty($gateway) && 'publish' === $this->status) {
             $gateway = 'manual';
         }
 
@@ -545,23 +545,23 @@ 
     }
 
     private function setup_gateway_title() {
-        $gateway_title = wpinv_get_gateway_checkout_label( $this->gateway );
+        $gateway_title = wpinv_get_gateway_checkout_label($this->gateway);
         return $gateway_title;
     }
 
     private function setup_transaction_id() {
-        $transaction_id = $this->get_meta( '_wpinv_transaction_id' );
+        $transaction_id = $this->get_meta('_wpinv_transaction_id');
 
-        if ( empty( $transaction_id ) || (int) $transaction_id === (int) $this->ID ) {
+        if (empty($transaction_id) || (int) $transaction_id === (int) $this->ID) {
             $gateway        = $this->gateway;
-            $transaction_id = apply_filters( 'wpinv_get_invoice_transaction_id-' . $gateway, $this->ID );
+            $transaction_id = apply_filters('wpinv_get_invoice_transaction_id-' . $gateway, $this->ID);
         }
 
         return $transaction_id;
     }
 
     private function setup_ip() {
-        $ip = $this->get_meta( '_wpinv_user_ip' );
+        $ip = $this->get_meta('_wpinv_user_ip');
         return $ip;
     }
 
@@ -571,62 +571,62 @@ 
     ///}
 
     private function setup_first_name() {
-        $first_name = $this->get_meta( '_wpinv_first_name' );
+        $first_name = $this->get_meta('_wpinv_first_name');
         return $first_name;
     }
 
     private function setup_last_name() {
-        $last_name = $this->get_meta( '_wpinv_last_name' );
+        $last_name = $this->get_meta('_wpinv_last_name');
         return $last_name;
     }
 
     private function setup_company() {
-        $company = $this->get_meta( '_wpinv_company' );
+        $company = $this->get_meta('_wpinv_company');
         return $company;
     }
 
     private function setup_vat_number() {
-        $vat_number = $this->get_meta( '_wpinv_vat_number' );
+        $vat_number = $this->get_meta('_wpinv_vat_number');
         return $vat_number;
     }
 
     private function setup_vat_rate() {
-        $vat_rate = $this->get_meta( '_wpinv_vat_rate' );
+        $vat_rate = $this->get_meta('_wpinv_vat_rate');
         return $vat_rate;
     }
 
     private function setup_adddress_confirmed() {
-        $adddress_confirmed = $this->get_meta( '_wpinv_adddress_confirmed' );
+        $adddress_confirmed = $this->get_meta('_wpinv_adddress_confirmed');
         return $adddress_confirmed;
     }
 
     private function setup_phone() {
-        $phone = $this->get_meta( '_wpinv_phone' );
+        $phone = $this->get_meta('_wpinv_phone');
         return $phone;
     }
 
     private function setup_address() {
-        $address = $this->get_meta( '_wpinv_address', true );
+        $address = $this->get_meta('_wpinv_address', true);
         return $address;
     }
 
     private function setup_city() {
-        $city = $this->get_meta( '_wpinv_city', true );
+        $city = $this->get_meta('_wpinv_city', true);
         return $city;
     }
 
     private function setup_country() {
-        $country = $this->get_meta( '_wpinv_country', true );
+        $country = $this->get_meta('_wpinv_country', true);
         return $country;
     }
 
     private function setup_state() {
-        $state = $this->get_meta( '_wpinv_state', true );
+        $state = $this->get_meta('_wpinv_state', true);
         return $state;
     }
 
     private function setup_zip() {
-        $zip = $this->get_meta( '_wpinv_zip', true );
+        $zip = $this->get_meta('_wpinv_zip', true);
         return $zip;
     }
 
@@ -635,7 +635,7 @@ 
             'user_id'            => $this->user_id,
             'first_name'         => $this->first_name,
             'last_name'          => $this->last_name,
-            'email'              => get_the_author_meta( 'email', $this->user_id ),
+            'email'              => get_the_author_meta('email', $this->user_id),
             'phone'              => $this->phone,
             'address'            => $this->address,
             'city'               => $this->city,
@@ -650,12 +650,12 @@ 
         );
 
         $user_info = array();
-        if ( isset( $this->payment_meta['user_info'] ) ) {
-            $user_info = maybe_unserialize( $this->payment_meta['user_info'] );
+        if (isset($this->payment_meta['user_info'])) {
+            $user_info = maybe_unserialize($this->payment_meta['user_info']);
 
-            if ( ! empty( $user_info ) && isset( $user_info['user_id'] ) && $post = get_post( $this->ID ) ) {
+            if (!empty($user_info) && isset($user_info['user_id']) && $post = get_post($this->ID)) {
                 $this->user_id = $post->post_author;
-                $this->email = get_the_author_meta( 'email', $this->user_id );
+                $this->email = get_the_author_meta('email', $this->user_id);
 
                 $user_info['user_id'] = $this->user_id;
                 $user_info['email'] = $this->email;
@@ -664,13 +664,13 @@ 
             }
         }
 
-        $user_info    = wp_parse_args( $user_info, $defaults );
+        $user_info = wp_parse_args($user_info, $defaults);
 
         // Get the user, but only if it's been created
-        $user = get_userdata( $this->user_id );
+        $user = get_userdata($this->user_id);
 
-        if ( ! empty( $user ) && $user->ID > 0 ) {
-            if ( empty( $user_info ) ) {
+        if (!empty($user) && $user->ID > 0) {
+            if (empty($user_info)) {
                 $user_info = array(
                     'user_id'    => $user->ID,
                     'first_name' => $user->first_name,
@@ -679,23 +679,23 @@ 
                     'discount'   => '',
                 );
             } else {
-                foreach ( $user_info as $key => $value ) {
-                    if ( ! empty( $value ) ) {
+                foreach ($user_info as $key => $value) {
+                    if (!empty($value)) {
                         continue;
                     }
 
-                    switch ( $key ) {
+                    switch ($key) {
                         case 'user_id':
-                            $user_info[ $key ] = $user->ID;
+                            $user_info[$key] = $user->ID;
                             break;
                         case 'first_name':
-                            $user_info[ $key ] = $user->first_name;
+                            $user_info[$key] = $user->first_name;
                             break;
                         case 'last_name':
-                            $user_info[ $key ] = $user->last_name;
+                            $user_info[$key] = $user->last_name;
                             break;
                         case 'email':
-                            $user_info[ $key ] = $user->user_email;
+                            $user_info[$key] = $user->user_email;
                             break;
                     }
                 }
@@ -706,25 +706,25 @@ 
     }
 
     private function setup_invoice_key() {
-        $key = $this->get_meta( '_wpinv_key', true );
+        $key = $this->get_meta('_wpinv_key', true);
 
         return $key;
     }
 
     private function setup_invoice_number() {
-        $number = $this->get_meta( '_wpinv_number', true );
+        $number = $this->get_meta('_wpinv_number', true);
 
-        if ( ! $number ) {
+        if (!$number) {
             $number = $this->ID;
 
-            if ( $this->status == 'auto-draft' ) {
-                if ( wpinv_sequential_number_active( $this->post_type ) ) {
-                    $next_number = wpinv_get_next_invoice_number( $this->post_type );
+            if ($this->status == 'auto-draft') {
+                if (wpinv_sequential_number_active($this->post_type)) {
+                    $next_number = wpinv_get_next_invoice_number($this->post_type);
                     $number      = $next_number;
                 }
             }
 
-            $number = wpinv_format_invoice_number( $number, $this->post_type );
+            $number = wpinv_format_invoice_number($number, $this->post_type);
         }
 
         return $number;
@@ -732,7 +732,7 @@ 
 
     public function save() {}
 
-    public function add_fee( $args ) {
+    public function add_fee($args) {
         $default_args = array(
             'label'   => '',
             'amount'  => 0,
@@ -742,36 +742,36 @@ 
             'item_id' => 0,
         );
 
-        $fee = wp_parse_args( $args, $default_args );
+        $fee = wp_parse_args($args, $default_args);
 
-        if ( empty( $fee['label'] ) ) {
+        if (empty($fee['label'])) {
             return false;
         }
 
-        $fee['id']  = sanitize_title( $fee['label'] );
+        $fee['id'] = sanitize_title($fee['label']);
 
-        $this->fees[]               = $fee;
+        $this->fees[] = $fee;
 
         $added_fee               = $fee;
         $added_fee['action']     = 'add';
         $this->pending['fees'][] = $added_fee;
-        reset( $this->fees );
+        reset($this->fees);
 
-        $this->increase_fees( $fee['amount'] );
+        $this->increase_fees($fee['amount']);
         return true;
     }
 
-    public function remove_fee( $key ) {
+    public function remove_fee($key) {
         $removed = false;
 
-        if ( is_numeric( $key ) ) {
-            $removed = $this->remove_fee_by( 'index', $key );
+        if (is_numeric($key)) {
+            $removed = $this->remove_fee_by('index', $key);
         }
 
         return $removed;
     }
 
-    public function remove_fee_by( $key, $value, $global = false ) {
+    public function remove_fee_by($key, $value, $global = false) {
         $allowed_fee_keys = apply_filters(
             'wpinv_fee_keys',
             array(
@@ -782,41 +782,41 @@ 
             )
         );
 
-        if ( ! in_array( $key, $allowed_fee_keys ) ) {
+        if (!in_array($key, $allowed_fee_keys)) {
             return false;
         }
 
         $removed = false;
-        if ( 'index' === $key && array_key_exists( $value, $this->fees ) ) {
-            $removed_fee             = $this->fees[ $value ];
+        if ('index' === $key && array_key_exists($value, $this->fees)) {
+            $removed_fee             = $this->fees[$value];
             $removed_fee['action']   = 'remove';
             $this->pending['fees'][] = $removed_fee;
 
-            $this->decrease_fees( $removed_fee['amount'] );
+            $this->decrease_fees($removed_fee['amount']);
 
-            unset( $this->fees[ $value ] );
+            unset($this->fees[$value]);
             $removed = true;
-        } elseif ( 'index' !== $key ) {
-            foreach ( $this->fees as $index => $fee ) {
-                if ( isset( $fee[ $key ] ) && $fee[ $key ] == $value ) {
+        } elseif ('index' !== $key) {
+            foreach ($this->fees as $index => $fee) {
+                if (isset($fee[$key]) && $fee[$key] == $value) {
                     $removed_fee             = $fee;
                     $removed_fee['action']   = 'remove';
                     $this->pending['fees'][] = $removed_fee;
 
-                    $this->decrease_fees( $removed_fee['amount'] );
+                    $this->decrease_fees($removed_fee['amount']);
 
-                    unset( $this->fees[ $index ] );
+                    unset($this->fees[$index]);
                     $removed = true;
 
-                    if ( false === $global ) {
+                    if (false === $global) {
                         break;
                     }
                 }
             }
         }
 
-        if ( true === $removed ) {
-            $this->fees = array_values( $this->fees );
+        if (true === $removed) {
+            $this->fees = array_values($this->fees);
         }
 
         return $removed;
@@ -824,28 +824,28 @@ 
 
 
 
-    public function add_note( $note = '', $customer_type = false, $added_by_user = false, $system = false ) {
+    public function add_note($note = '', $customer_type = false, $added_by_user = false, $system = false) {
         // Bail if no note specified
-        if ( ! $note ) {
+        if (!$note) {
             return false;
         }
 
-        if ( empty( $this->ID ) ) {
+        if (empty($this->ID)) {
             return false;
         }
 
-        if ( ( ( is_user_logged_in() && wpinv_current_user_can_manage_invoicing() ) || $added_by_user ) && ! $system ) {
-            $user                 = get_user_by( 'id', get_current_user_id() );
+        if (((is_user_logged_in() && wpinv_current_user_can_manage_invoicing()) || $added_by_user) && !$system) {
+            $user                 = get_user_by('id', get_current_user_id());
             $comment_author       = $user->display_name;
             $comment_author_email = $user->user_email;
         } else {
             $comment_author       = 'System';
             $comment_author_email = 'system@';
-            $comment_author_email .= isset( $_SERVER['HTTP_HOST'] ) ? str_replace( 'www.', '', $_SERVER['HTTP_HOST'] ) : 'noreply.com';
-            $comment_author_email = sanitize_email( $comment_author_email );
+            $comment_author_email .= isset($_SERVER['HTTP_HOST']) ? str_replace('www.', '', $_SERVER['HTTP_HOST']) : 'noreply.com';
+            $comment_author_email = sanitize_email($comment_author_email);
         }
 
-        do_action( 'wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type );
+        do_action('wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type);
 
         $note_id = wp_insert_comment(
             wp_filter_comment(
@@ -854,8 +854,8 @@ 
 					'comment_content'      => $note,
 					'comment_agent'        => 'WPInvoicing',
 					'user_id'              => is_admin() ? get_current_user_id() : 0,
-					'comment_date'         => current_time( 'mysql' ),
-					'comment_date_gmt'     => current_time( 'mysql', 1 ),
+					'comment_date'         => current_time('mysql'),
+					'comment_date_gmt'     => current_time('mysql', 1),
 					'comment_approved'     => 1,
 					'comment_parent'       => 0,
 					'comment_author'       => $comment_author,
@@ -867,10 +867,10 @@ 
             )
         );
 
-        do_action( 'wpinv_insert_payment_note', $note_id, $this->ID, $note );
+        do_action('wpinv_insert_payment_note', $note_id, $this->ID, $note);
 
-        if ( $customer_type ) {
-            add_comment_meta( $note_id, '_wpi_customer_note', 1 );
+        if ($customer_type) {
+            add_comment_meta($note_id, '_wpi_customer_note', 1);
 
             do_action(
                 'wpinv_new_customer_note',
@@ -884,40 +884,40 @@ 
         return $note_id;
     }
 
-    private function increase_subtotal( $amount = 0.00 ) {
+    private function increase_subtotal($amount = 0.00) {
         $amount          = (float) $amount;
         $this->subtotal += $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
         $this->recalculate_total();
     }
 
-    private function decrease_subtotal( $amount = 0.00 ) {
+    private function decrease_subtotal($amount = 0.00) {
         $amount          = (float) $amount;
         $this->subtotal -= $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
-        if ( $this->subtotal < 0 ) {
+        if ($this->subtotal < 0) {
             $this->subtotal = 0;
         }
 
         $this->recalculate_total();
     }
 
-    private function increase_fees( $amount = 0.00 ) {
-        $amount            = (float)$amount;
+    private function increase_fees($amount = 0.00) {
+        $amount            = (float) $amount;
         $this->fees_total += $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
         $this->recalculate_total();
     }
 
-    private function decrease_fees( $amount = 0.00 ) {
+    private function decrease_fees($amount = 0.00) {
         $amount            = (float) $amount;
         $this->fees_total -= $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
-        if ( $this->fees_total < 0 ) {
+        if ($this->fees_total < 0) {
             $this->fees_total = 0;
         }
 
@@ -928,56 +928,56 @@ 
         global $wpi_nosave;
 
         $this->total = $this->subtotal + $this->tax + $this->fees_total;
-        $this->total = wpinv_round_amount( $this->total );
+        $this->total = wpinv_round_amount($this->total);
 
-        do_action( 'wpinv_invoice_recalculate_total', $this, $wpi_nosave );
+        do_action('wpinv_invoice_recalculate_total', $this, $wpi_nosave);
     }
 
-    public function increase_tax( $amount = 0.00 ) {
+    public function increase_tax($amount = 0.00) {
         $amount       = (float) $amount;
         $this->tax   += $amount;
 
         $this->recalculate_total();
     }
 
-    public function decrease_tax( $amount = 0.00 ) {
+    public function decrease_tax($amount = 0.00) {
         $amount     = (float) $amount;
         $this->tax -= $amount;
 
-        if ( $this->tax < 0 ) {
+        if ($this->tax < 0) {
             $this->tax = 0;
         }
 
         $this->recalculate_total();
     }
 
-    public function update_status( $new_status = false, $note = '', $manual = false ) {
-        $old_status = ! empty( $this->old_status ) ? $this->old_status : get_post_status( $this->ID );
+    public function update_status($new_status = false, $note = '', $manual = false) {
+        $old_status = !empty($this->old_status) ? $this->old_status : get_post_status($this->ID);
 
-        if ( $old_status === $new_status && in_array( $new_status, array_keys( wpinv_get_invoice_statuses( true ) ) ) ) {
+        if ($old_status === $new_status && in_array($new_status, array_keys(wpinv_get_invoice_statuses(true)))) {
             return false; // Don't permit status changes that aren't changes
         }
 
-        $do_change = apply_filters( 'wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status );
+        $do_change = apply_filters('wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status);
         $updated = false;
 
-        if ( $do_change ) {
-            do_action( 'wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status );
+        if ($do_change) {
+            do_action('wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status);
 
             $update_post_data                   = array();
             $update_post_data['ID']             = $this->ID;
             $update_post_data['post_status']    = $new_status;
-            $update_post_data['edit_date']      = current_time( 'mysql', 0 );
-            $update_post_data['edit_date_gmt']  = current_time( 'mysql', 1 );
+            $update_post_data['edit_date']      = current_time('mysql', 0);
+            $update_post_data['edit_date_gmt']  = current_time('mysql', 1);
 
-            $update_post_data = apply_filters( 'wpinv_update_invoice_status_fields', $update_post_data, $this->ID );
+            $update_post_data = apply_filters('wpinv_update_invoice_status_fields', $update_post_data, $this->ID);
 
-            $updated = wp_update_post( $update_post_data );
+            $updated = wp_update_post($update_post_data);
 
             // Status was changed.
-            do_action( 'wpinv_status_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_update_status', $this->ID, $new_status, $old_status );
+            do_action('wpinv_status_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_update_status', $this->ID, $new_status, $old_status);
         }
 
         return $updated;
@@ -994,114 +994,114 @@ 
     public function update_meta() {}
 
     // get data
-    public function get_meta( $meta_key = '_wpinv_payment_meta', $single = true ) {
-        $meta = get_post_meta( $this->ID, $meta_key, $single );
+    public function get_meta($meta_key = '_wpinv_payment_meta', $single = true) {
+        $meta = get_post_meta($this->ID, $meta_key, $single);
 
-        if ( $meta_key === '_wpinv_payment_meta' ) {
+        if ($meta_key === '_wpinv_payment_meta') {
 
-            if ( ! is_array( $meta ) ) {
-$meta = array();} // we need this to be an array so make sure it is.
+            if (!is_array($meta)) {
+$meta = array(); } // we need this to be an array so make sure it is.
 
-            if ( empty( $meta['key'] ) ) {
+            if (empty($meta['key'])) {
                 $meta['key'] = $this->setup_invoice_key();
             }
 
-            if ( empty( $meta['date'] ) ) {
-                $meta['date'] = get_post_field( 'post_date', $this->ID );
+            if (empty($meta['date'])) {
+                $meta['date'] = get_post_field('post_date', $this->ID);
             }
         }
 
-        $meta = apply_filters( 'wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID );
+        $meta = apply_filters('wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID);
 
-        return apply_filters( 'wpinv_get_invoice_meta', $meta, $this->ID, $meta_key );
+        return apply_filters('wpinv_get_invoice_meta', $meta, $this->ID, $meta_key);
     }
 
     public function get_description() {
-        $post = get_post( $this->ID );
+        $post = get_post($this->ID);
 
-        $description = ! empty( $post ) ? $post->post_content : '';
-        return apply_filters( 'wpinv_get_description', $description, $this->ID, $this );
+        $description = !empty($post) ? $post->post_content : '';
+        return apply_filters('wpinv_get_description', $description, $this->ID, $this);
     }
 
-    public function get_status( $nicename = false ) {
-        if ( ! $nicename ) {
+    public function get_status($nicename = false) {
+        if (!$nicename) {
             $status = $this->status;
         } else {
             $status = $this->status_nicename;
         }
 
-        return apply_filters( 'wpinv_get_status', $status, $nicename, $this->ID, $this );
+        return apply_filters('wpinv_get_status', $status, $nicename, $this->ID, $this);
     }
 
     public function get_cart_details() {
-        return apply_filters( 'wpinv_cart_details', $this->cart_details, $this->ID, $this );
+        return apply_filters('wpinv_cart_details', $this->cart_details, $this->ID, $this);
     }
 
-    public function get_subtotal( $currency = false ) {
-        $subtotal = wpinv_round_amount( $this->subtotal );
+    public function get_subtotal($currency = false) {
+        $subtotal = wpinv_round_amount($this->subtotal);
 
-        if ( $currency ) {
-            $subtotal = wpinv_price( wpinv_format_amount( $subtotal, null, ! $currency ), $this->get_currency() );
+        if ($currency) {
+            $subtotal = wpinv_price(wpinv_format_amount($subtotal, null, !$currency), $this->get_currency());
         }
 
-        return apply_filters( 'wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency);
     }
 
-    public function get_total( $currency = false ) {
-        if ( $this->is_free_trial() ) {
-            $total = wpinv_round_amount( 0 );
+    public function get_total($currency = false) {
+        if ($this->is_free_trial()) {
+            $total = wpinv_round_amount(0);
         } else {
-            $total = wpinv_round_amount( $this->total );
+            $total = wpinv_round_amount($this->total);
         }
-        if ( $currency ) {
-            $total = wpinv_price( wpinv_format_amount( $total, null, ! $currency ), $this->get_currency() );
+        if ($currency) {
+            $total = wpinv_price(wpinv_format_amount($total, null, !$currency), $this->get_currency());
         }
 
-        return apply_filters( 'wpinv_get_invoice_total', $total, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_total', $total, $this->ID, $this, $currency);
     }
 
     public function get_recurring_details() {}
 
-    public function get_final_tax( $currency = false ) {
-        $final_total = wpinv_round_amount( $this->tax );
-        if ( $currency ) {
-            $final_total = wpinv_price( wpinv_format_amount( $final_total, null, ! $currency ), $this->get_currency() );
+    public function get_final_tax($currency = false) {
+        $final_total = wpinv_round_amount($this->tax);
+        if ($currency) {
+            $final_total = wpinv_price(wpinv_format_amount($final_total, null, !$currency), $this->get_currency());
         }
 
-        return apply_filters( 'wpinv_get_invoice_final_total', $final_total, $this, $currency );
+        return apply_filters('wpinv_get_invoice_final_total', $final_total, $this, $currency);
     }
 
-    public function get_discounts( $array = false ) {
+    public function get_discounts($array = false) {
         $discounts = $this->discounts;
-        if ( $array && $discounts ) {
-            $discounts = explode( ',', $discounts );
+        if ($array && $discounts) {
+            $discounts = explode(',', $discounts);
         }
-        return apply_filters( 'wpinv_payment_discounts', $discounts, $this->ID, $this, $array );
+        return apply_filters('wpinv_payment_discounts', $discounts, $this->ID, $this, $array);
     }
 
-    public function get_discount( $currency = false, $dash = false ) {
-        if ( ! empty( $this->discounts ) ) {
+    public function get_discount($currency = false, $dash = false) {
+        if (!empty($this->discounts)) {
             global $ajax_cart_details;
             $ajax_cart_details = $this->get_cart_details();
 
-            if ( ! empty( $ajax_cart_details ) && count( $ajax_cart_details ) == count( $this->items ) ) {
+            if (!empty($ajax_cart_details) && count($ajax_cart_details) == count($this->items)) {
                 $cart_items = $ajax_cart_details;
             } else {
                 $cart_items = $this->items;
             }
 
-            $this->discount = wpinv_get_cart_items_discount_amount( $cart_items, $this->discounts );
+            $this->discount = wpinv_get_cart_items_discount_amount($cart_items, $this->discounts);
         }
-        $discount   = wpinv_round_amount( $this->discount );
+        $discount   = wpinv_round_amount($this->discount);
         $dash       = $dash && $discount > 0 ? '&ndash;' : '';
 
-        if ( $currency ) {
-            $discount = wpinv_price( wpinv_format_amount( $discount, null, ! $currency ), $this->get_currency() );
+        if ($currency) {
+            $discount = wpinv_price(wpinv_format_amount($discount, null, !$currency), $this->get_currency());
         }
 
-        $discount   = $dash . $discount;
+        $discount = $dash . $discount;
 
-        return apply_filters( 'wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash );
+        return apply_filters('wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash);
     }
 
     public function get_discount_code() {
@@ -1113,150 +1113,150 @@ 
         return (int) $this->disable_taxes === 0;
     }
 
-    public function get_tax( $currency = false ) {
-        $tax = wpinv_round_amount( $this->tax );
+    public function get_tax($currency = false) {
+        $tax = wpinv_round_amount($this->tax);
 
-        if ( $currency ) {
-            $tax = wpinv_price( wpinv_format_amount( $tax, null, ! $currency ), $this->get_currency() );
+        if ($currency) {
+            $tax = wpinv_price(wpinv_format_amount($tax, null, !$currency), $this->get_currency());
         }
 
-        if ( ! $this->is_taxable() ) {
-            $tax = wpinv_round_amount( 0.00 );
+        if (!$this->is_taxable()) {
+            $tax = wpinv_round_amount(0.00);
         }
 
-        return apply_filters( 'wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency);
     }
 
-    public function get_fees( $type = 'all' ) {
-        $fees    = array();
+    public function get_fees($type = 'all') {
+        $fees = array();
 
-        if ( ! empty( $this->fees ) && is_array( $this->fees ) ) {
-            foreach ( $this->fees as $fee ) {
-                if ( 'all' != $type && ! empty( $fee['type'] ) && $type != $fee['type'] ) {
+        if (!empty($this->fees) && is_array($this->fees)) {
+            foreach ($this->fees as $fee) {
+                if ('all' != $type && !empty($fee['type']) && $type != $fee['type']) {
                     continue;
                 }
 
-                $fee['label'] = stripslashes( $fee['label'] );
-                $fee['amount_display'] = wpinv_price( $fee['amount'], $this->get_currency() );
-                $fees[]    = $fee;
+                $fee['label'] = stripslashes($fee['label']);
+                $fee['amount_display'] = wpinv_price($fee['amount'], $this->get_currency());
+                $fees[] = $fee;
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees', $fees, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees', $fees, $this->ID, $this);
     }
 
     public function get_fees_total() {
         $fees_total = (float) 0.00;
 
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
-        if ( ! empty( $payment_fees ) ) {
-            foreach ( $payment_fees as $fee ) {
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
+        if (!empty($payment_fees)) {
+            foreach ($payment_fees as $fee) {
                 $fees_total += (float) $fee['amount'];
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this);
 
     }
 
     public function get_user_id() {
-        return apply_filters( 'wpinv_user_id', $this->user_id, $this->ID, $this );
+        return apply_filters('wpinv_user_id', $this->user_id, $this->ID, $this);
     }
 
     public function get_first_name() {
-        return apply_filters( 'wpinv_first_name', $this->first_name, $this->ID, $this );
+        return apply_filters('wpinv_first_name', $this->first_name, $this->ID, $this);
     }
 
     public function get_last_name() {
-        return apply_filters( 'wpinv_last_name', $this->last_name, $this->ID, $this );
+        return apply_filters('wpinv_last_name', $this->last_name, $this->ID, $this);
     }
 
     public function get_user_full_name() {
-        return apply_filters( 'wpinv_user_full_name', $this->full_name, $this->ID, $this );
+        return apply_filters('wpinv_user_full_name', $this->full_name, $this->ID, $this);
     }
 
     public function get_user_info() {
-        return apply_filters( 'wpinv_user_info', $this->user_info, $this->ID, $this );
+        return apply_filters('wpinv_user_info', $this->user_info, $this->ID, $this);
     }
 
     public function get_email() {
-        return apply_filters( 'wpinv_user_email', $this->email, $this->ID, $this );
+        return apply_filters('wpinv_user_email', $this->email, $this->ID, $this);
     }
 
     public function get_address() {
-        return apply_filters( 'wpinv_address', $this->address, $this->ID, $this );
+        return apply_filters('wpinv_address', $this->address, $this->ID, $this);
     }
 
     public function get_phone() {
-        return apply_filters( 'wpinv_phone', $this->phone, $this->ID, $this );
+        return apply_filters('wpinv_phone', $this->phone, $this->ID, $this);
     }
 
     public function get_number() {
-        return apply_filters( 'wpinv_number', $this->number, $this->ID, $this );
+        return apply_filters('wpinv_number', $this->number, $this->ID, $this);
     }
 
     public function get_items() {
-        return apply_filters( 'wpinv_payment_meta_items', $this->items, $this->ID, $this );
+        return apply_filters('wpinv_payment_meta_items', $this->items, $this->ID, $this);
     }
 
     public function get_key() {
-        return apply_filters( 'wpinv_key', $this->key, $this->ID, $this );
+        return apply_filters('wpinv_key', $this->key, $this->ID, $this);
     }
 
     public function get_transaction_id() {
-        return apply_filters( 'wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this);
     }
 
     public function get_gateway() {
-        return apply_filters( 'wpinv_gateway', $this->gateway, $this->ID, $this );
+        return apply_filters('wpinv_gateway', $this->gateway, $this->ID, $this);
     }
 
     public function get_gateway_title() {}
 
     public function get_currency() {
-        return apply_filters( 'wpinv_currency_code', $this->currency, $this->ID, $this );
+        return apply_filters('wpinv_currency_code', $this->currency, $this->ID, $this);
     }
 
     public function get_created_date() {
-        return apply_filters( 'wpinv_created_date', $this->date, $this->ID, $this );
+        return apply_filters('wpinv_created_date', $this->date, $this->ID, $this);
     }
 
-    public function get_due_date( $display = false ) {
-        $due_date = apply_filters( 'wpinv_due_date', $this->due_date, $this->ID, $this );
+    public function get_due_date($display = false) {
+        $due_date = apply_filters('wpinv_due_date', $this->due_date, $this->ID, $this);
 
-        if ( ! $display ) {
+        if (!$display) {
             return $due_date;
         }
 
-        return getpaid_format_date( $this->due_date );
+        return getpaid_format_date($this->due_date);
     }
 
     public function get_completed_date() {
-        return apply_filters( 'wpinv_completed_date', $this->completed_date, $this->ID, $this );
+        return apply_filters('wpinv_completed_date', $this->completed_date, $this->ID, $this);
     }
 
-    public function get_invoice_date( $formatted = true ) {
+    public function get_invoice_date($formatted = true) {
         $date_completed = $this->completed_date;
         $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? $date_completed : '';
 
-        if ( $invoice_date == '' ) {
+        if ($invoice_date == '') {
             $date_created   = $this->date;
             $invoice_date   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? $date_created : '';
         }
 
-        if ( $formatted && $invoice_date ) {
-            $invoice_date   = getpaid_format_date( $invoice_date );
+        if ($formatted && $invoice_date) {
+            $invoice_date = getpaid_format_date($invoice_date);
         }
 
-        return apply_filters( 'wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this);
     }
 
     public function get_ip() {
-        return apply_filters( 'wpinv_user_ip', $this->ip, $this->ID, $this );
+        return apply_filters('wpinv_user_ip', $this->ip, $this->ID, $this);
     }
 
-    public function has_status( $status ) {
-        return apply_filters( 'wpinv_has_status', ( is_array( $status ) && in_array( $this->get_status(), $status ) ) || $this->get_status() === $status ? true : false, $this, $status );
+    public function has_status($status) {
+        return apply_filters('wpinv_has_status', (is_array($status) && in_array($this->get_status(), $status)) || $this->get_status() === $status ? true : false, $this, $status);
     }
 
     public function add_item() {}
@@ -1273,66 +1273,66 @@ 
 
     public function get_view_url() {}
 
-    public function generate_key( $string = '' ) {
-        $auth_key  = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-        return strtolower( md5( $string . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'wpinv', true ) ) );  // Unique key
+    public function generate_key($string = '') {
+        $auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+        return strtolower(md5($string . date('Y-m-d H:i:s') . $auth_key . uniqid('wpinv', true))); // Unique key
     }
 
     public function is_recurring() {
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return false;
         }
 
         $has_subscription = false;
-        foreach ( $this->cart_details as $cart_item ) {
-            if ( ! empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] ) ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $has_subscription = true;
                 break;
             }
         }
 
-        if ( count( $this->cart_details ) > 1 ) {
+        if (count($this->cart_details) > 1) {
             $has_subscription = false;
         }
 
-        return apply_filters( 'wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details );
+        return apply_filters('wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details);
     }
 
     public function is_free_trial() {
         $is_free_trial = false;
 
-        if ( $this->is_parent() && $item = $this->get_recurring( true ) ) {
-            if ( ! empty( $item ) && $item->has_free_trial() ) {
+        if ($this->is_parent() && $item = $this->get_recurring(true)) {
+            if (!empty($item) && $item->has_free_trial()) {
                 $is_free_trial = true;
             }
         }
 
-        return apply_filters( 'wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details, $this );
+        return apply_filters('wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details, $this);
     }
 
     public function is_initial_free() {}
 
-    public function get_recurring( $object = false ) {
+    public function get_recurring($object = false) {
         $item = null;
 
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return $item;
         }
 
-        foreach ( $this->cart_details as $cart_item ) {
-            if ( ! empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] ) ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $item = $cart_item['id'];
                 break;
             }
         }
 
-        if ( $object ) {
-            $item = $item ? new WPInv_Item( $item ) : null;
+        if ($object) {
+            $item = $item ? new WPInv_Item($item) : null;
 
-            apply_filters( 'wpinv_invoice_get_recurring_item', $item, $this );
+            apply_filters('wpinv_invoice_get_recurring_item', $item, $this);
         }
 
-        return apply_filters( 'wpinv_invoice_get_recurring_item_id', $item, $this );
+        return apply_filters('wpinv_invoice_get_recurring_item_id', $item, $this);
     }
 
     public function get_subscription_name() {}
@@ -1340,7 +1340,7 @@ 
     public function get_subscription_id() {}
 
     public function is_parent() {
-        return ! empty( $this->parent_invoice );
+        return !empty($this->parent_invoice);
     }
 
     public function is_renewal() {}
@@ -1354,8 +1354,8 @@ 
     public function is_refunded() {}
 
     public function is_free() {
-        $total = (float) wpinv_round_amount( $this->get_total() );
-        return $total > 0 && ! $this->is_recurring();
+        $total = (float) wpinv_round_amount($this->get_total());
+        return $total > 0 && !$this->is_recurring();
     }
 
     public function has_vat() {}

templates/payment-forms/elements/separator.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 ?>
 
 <hr class="featurette-divider" />

templates/wpinv-payment-processing.php

Spacing +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
     <p>
         <?php
             echo wp_sprintf(
-                wp_kses_post( __( 'Your payment is processing. This page will reload automatically in 10 seconds. If it does not, click <a href="%s">here</a>.', 'invoicing' ) ),
-                esc_url_raw( remove_query_arg( 'payment-confirm' ) )
+                wp_kses_post(__('Your payment is processing. This page will reload automatically in 10 seconds. If it does not, click <a href="%s">here</a>.', 'invoicing')),
+                esc_url_raw(remove_query_arg('payment-confirm'))
             );
         ?>
         <i class="fa fa-spin fa-refresh"></i>
@@ -13,7 +13,7 @@ 
     <script type="text/javascript">
         setTimeout(
             function(){
-                window.location.href = '<?php echo esc_url_raw( remove_query_arg( 'payment-confirm' ) ); ?>';
+                window.location.href = '<?php echo esc_url_raw(remove_query_arg('payment-confirm')); ?>';
             },
             10000
         );

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

Spacing +3 added lines, -3 removed lines

@@ -7,14 +7,14 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div v-if='!is_default'>
-    <div class='alert alert-info' role='alert'><?php esc_html_e( 'Item totals will appear here. Click to set items.', 'invoicing' ); ?></div>
+    <div class='alert alert-info' role='alert'><?php esc_html_e('Item totals will appear here. Click to set items.', 'invoicing'); ?></div>
 </div>
 
 <div v-if='is_default'>
-    <div class='alert alert-info' role='alert'><?php esc_html_e( 'Item totals will appear here.', 'invoicing' ); ?></div>
+    <div class='alert alert-info' role='alert'><?php esc_html_e('Item totals will appear here.', 'invoicing'); ?></div>
 </div>

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

Spacing +3 added lines, -3 removed lines

@@ -7,15 +7,15 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <label><span v-html="form_element.label"></span></label>
 <div class="d-flex w-100 flex-column align-items-center justify-content-center p-2" style="height: 200px; border: 3px dashed rgb(136, 136, 136); cursor: pointer;">
     <div class="h5 text-dark">
-        <span v-if="form_element.max_file_num > 1"><?php esc_html_e( 'Drag files to this area or click to upload', 'invoicing' ); ?></span>
-        <span v-if="form_element.max_file_num < 2"><?php esc_html_e( 'Drag your file to this area or click to upload', 'invoicing' ); ?></span>
+        <span v-if="form_element.max_file_num > 1"><?php esc_html_e('Drag files to this area or click to upload', 'invoicing'); ?></span>
+        <span v-if="form_element.max_file_num < 2"><?php esc_html_e('Drag your file to this area or click to upload', 'invoicing'); ?></span>
     </div>
     <small v-if='form_element.description' class='form-text text-muted' v-html='form_element.description'></small>
 </div>

templates/invoice/header-left-actions.php

Spacing +8 added lines, -8 removed lines

@@ -8,25 +8,25 @@
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
         <div class="getpaid-header-left-actions">
 
-            <?php if ( $invoice->is_type( 'invoice' ) && $invoice->needs_payment() && ! $invoice->is_held() ) : ?>
-                <a class="btn btn-sm btn-primary m-1 d-inline-block invoice-action-pay" href="<?php echo esc_url( $invoice->get_checkout_payment_url() ); ?>">
-                    <?php esc_html_e( 'Pay For Invoice', 'invoicing' ); ?>
+            <?php if ($invoice->is_type('invoice') && $invoice->needs_payment() && !$invoice->is_held()) : ?>
+                <a class="btn btn-sm btn-primary m-1 d-inline-block invoice-action-pay" href="<?php echo esc_url($invoice->get_checkout_payment_url()); ?>">
+                    <?php esc_html_e('Pay For Invoice', 'invoicing'); ?>
                 </a>
             <?php endif; ?>
 
-            <?php if ( $invoice->is_type( 'invoice' ) && $invoice->is_paid() ) : ?>
-                <a class="btn btn-sm btn-info m-1 d-inline-block invoice-action-receipt" href="<?php echo esc_url( $invoice->get_receipt_url() ); ?>">
-                    <?php esc_html_e( 'View Receipt', 'invoicing' ); ?>
+            <?php if ($invoice->is_type('invoice') && $invoice->is_paid()) : ?>
+                <a class="btn btn-sm btn-info m-1 d-inline-block invoice-action-receipt" href="<?php echo esc_url($invoice->get_receipt_url()); ?>">
+                    <?php esc_html_e('View Receipt', 'invoicing'); ?>
                 </a>
             <?php endif; ?>
 
-            <?php do_action( 'wpinv_invoice_display_left_actions', $invoice ); ?>
+            <?php do_action('wpinv_invoice_display_left_actions', $invoice); ?>
 
         </div>
 

templates/subscriptions/subscriptions-table-row.php

Indentation +28 added lines, -28 removed lines

@@ -13,42 +13,42 @@
 
 foreach ( array_keys( $widget->get_subscriptions_table_columns() ) as $column ) :
 
-	$class = sanitize_html_class( $column );
-	echo "<td class='getpaid-subscriptions-table-column-" . esc_attr( $class ) . "'>";
+    $class = sanitize_html_class( $column );
+    echo "<td class='getpaid-subscriptions-table-column-" . esc_attr( $class ) . "'>";
 
-		do_action( "getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription );
+        do_action( "getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription );
 
-		switch ( $column ) :
+        switch ( $column ) :
 
-		case 'subscription':
-			$subscription_id = (int) $subscription->get_id();
-			$url             = esc_url( $subscription->get_view_url() );
-			$id_label        = sprintf(
-				esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
-				(int) $subscription->get_id()
-			);
-			echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
-			break;
+        case 'subscription':
+            $subscription_id = (int) $subscription->get_id();
+            $url             = esc_url( $subscription->get_view_url() );
+            $id_label        = sprintf(
+                esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
+                (int) $subscription->get_id()
+            );
+            echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
+            break;
 
-		case 'status':
-			echo esc_html( $subscription->get_status_label() );
-			break;
+        case 'status':
+            echo esc_html( $subscription->get_status_label() );
+            break;
 
-		case 'renewal-date':
-			$renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
-			echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
-			break;
+        case 'renewal-date':
+            $renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
+            echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
+            break;
 
-		case 'amount':
-			$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-			$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-			echo wp_kses_post( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
-			break;
+        case 'amount':
+            $frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+            $amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
+            echo wp_kses_post( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
+            break;
 
-		endswitch;
+        endswitch;
 
-		do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
+        do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
 
-	echo '</td>';
+    echo '</td>';
 
 endforeach;

Switch Indentation +32 added lines, -32 removed lines

@@ -20,35 +20,35 @@
 
 		switch ( $column ) :
 
-		case 'subscription':
-			$subscription_id = (int) $subscription->get_id();
-			$url             = esc_url( $subscription->get_view_url() );
-			$id_label        = sprintf(
-				esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
-				(int) $subscription->get_id()
-			);
-			echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
-			break;
-
-		case 'status':
-			echo esc_html( $subscription->get_status_label() );
-			break;
-
-		case 'renewal-date':
-			$renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
-			echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
-			break;
-
-		case 'amount':
-			$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-			$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-			echo wp_kses_post( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
-			break;
-
-		endswitch;
-
-		do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
-
-	echo '</td>';
-
-endforeach;
+		    case 'subscription':
+			    $subscription_id = (int) $subscription->get_id();
+			    $url             = esc_url( $subscription->get_view_url() );
+			    $id_label        = sprintf(
+				    esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
+				    (int) $subscription->get_id()
+			    );
+			    echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
+			    break;
+
+		    case 'status':
+			    echo esc_html( $subscription->get_status_label() );
+			    break;
+
+		    case 'renewal-date':
+			    $renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
+			    echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
+			    break;
+
+		    case 'amount':
+			    $frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+			    $amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
+			    echo wp_kses_post( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
+			    break;
+
+		    endswitch;
+
+		    do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
+
+	    echo '</td>';
+
+    endforeach;

Spacing +16 added lines, -16 removed lines

@@ -9,45 +9,45 @@
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-foreach ( array_keys( $widget->get_subscriptions_table_columns() ) as $column ) :
+foreach (array_keys($widget->get_subscriptions_table_columns()) as $column) :
 
-	$class = sanitize_html_class( $column );
-	echo "<td class='getpaid-subscriptions-table-column-" . esc_attr( $class ) . "'>";
+	$class = sanitize_html_class($column);
+	echo "<td class='getpaid-subscriptions-table-column-" . esc_attr($class) . "'>";
 
-		do_action( "getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription );
+		do_action("getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription);
 
-		switch ( $column ) :
+		switch ($column) :
 
 		case 'subscription':
 			$subscription_id = (int) $subscription->get_id();
-			$url             = esc_url( $subscription->get_view_url() );
+			$url             = esc_url($subscription->get_view_url());
 			$id_label        = sprintf(
-				esc_attr_x( '#%s', 'subscription id', 'invoicing' ),
+				esc_attr_x('#%s', 'subscription id', 'invoicing'),
 				(int) $subscription->get_id()
 			);
-			echo wp_kses_post( $widget->add_row_actions( "<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription ) );
+			echo wp_kses_post($widget->add_row_actions("<a href='$url' class='font-weight-bold text-decoration-none'>$id_label</a>", $subscription));
 			break;
 
 		case 'status':
-			echo esc_html( $subscription->get_status_label() );
+			echo esc_html($subscription->get_status_label());
 			break;
 
 		case 'renewal-date':
-			$renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
-			echo $subscription->is_active() ? esc_html( $renewal ) : '&mdash;';
+			$renewal = getpaid_format_date_value($subscription->get_next_renewal_date());
+			echo $subscription->is_active() ? esc_html($renewal) : '&mdash;';
 			break;
 
 		case 'amount':
-			$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-			$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-			echo wp_kses_post( "<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
+			$frequency = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
+			$amount    = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency());
+			echo wp_kses_post("<span>$amount</span> / <span class='getpaid-item-recurring-period'>$frequency</span>");
 			break;
 
 		endswitch;
 
-		do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
+		do_action("getpaid_subscriptions_frontend_subscription_table_$column", $subscription);
 
 	echo '</td>';
 

includes/admin/views/wizard-thank-you.php

Spacing +16 added lines, -16 removed lines

@@ -4,68 +4,68 @@
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class="card shadow-sm my-5">
 	<div class="text-center card-body">
-		<h1 class="h3"><?php esc_html_e( 'Awesome, you are ready to Get Paid', 'invoicing' ); ?></h1>
+		<h1 class="h3"><?php esc_html_e('Awesome, you are ready to Get Paid', 'invoicing'); ?></h1>
 
 		<div class="geodirectory-message geodirectory-tracker">
-			<p><?php esc_html_e( 'Thank you for choosing GetPaid!', 'invoicing' ); ?> <i class="far fa-smile-beam"></i></p>
+			<p><?php esc_html_e('Thank you for choosing GetPaid!', 'invoicing'); ?> <i class="far fa-smile-beam"></i></p>
 		</div>
 
 		<div class="gp-setup-next-steps">
 			<div class="gp-setup-next-steps-first mb-4">
 				<div>
-					<h2 class="h3"><i class="fas fa-arrow-down"></i> <?php esc_html_e( 'Watch This', 'invoicing' ); ?> <i class="fas fa-arrow-down"></i></h2>
+					<h2 class="h3"><i class="fas fa-arrow-down"></i> <?php esc_html_e('Watch This', 'invoicing'); ?> <i class="fas fa-arrow-down"></i></h2>
 					<div class="embed-responsive embed-responsive-16by9 mb-4">
 						<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/TXZuPXHjt9E?rel=0" allowfullscreen></iframe>
 					</div>
 				</div>
-				<h2 class="h3"><?php esc_html_e( 'Next steps', 'invoicing' ); ?></h2>
+				<h2 class="h3"><?php esc_html_e('Next steps', 'invoicing'); ?></h2>
 
 				<div class="d-flex justify-content-between">
 					<a
 						class="btn btn-outline-primary btn-sm"
-						href="<?php echo esc_url( admin_url( 'post-new.php?post_type=wpi_item' ) ); ?>">
+						href="<?php echo esc_url(admin_url('post-new.php?post_type=wpi_item')); ?>">
 						<span class="h1 d-block"><i class="fas fa-box-open"></i></span>
-						<?php esc_html_e( 'Create Item', 'invoicing' ); ?>
+						<?php esc_html_e('Create Item', 'invoicing'); ?>
 					</a>
 					<a
 						class="btn btn-outline-primary btn-sm"
-						href="<?php echo esc_url( admin_url( 'post-new.php?post_type=wpi_payment_form' ) ); ?>">
+						href="<?php echo esc_url(admin_url('post-new.php?post_type=wpi_payment_form')); ?>">
 						<span class="h1 d-block"><i class="fas fa-align-justify"></i></span>
-						<?php esc_html_e( 'Create Payment Form', 'invoicing' ); ?>
+						<?php esc_html_e('Create Payment Form', 'invoicing'); ?>
 					</a>
 					<a
 						class="btn btn-outline-primary btn-sm"
-						href="<?php echo esc_url( admin_url( 'post-new.php?post_type=wpi_invoice' ) ); ?>">
+						href="<?php echo esc_url(admin_url('post-new.php?post_type=wpi_invoice')); ?>">
 						<span class="h1 d-block"><i class="fas fa-file-alt"></i></span>
-						<?php esc_html_e( 'Create Invoice', 'invoicing' ); ?>
+						<?php esc_html_e('Create Invoice', 'invoicing'); ?>
 					</a>
 				</div>
 
 
 
-						<h2 class="h3 mt-4"><?php esc_html_e( 'Learn more', 'invoicing' ); ?></h2>
+						<h2 class="h3 mt-4"><?php esc_html_e('Learn more', 'invoicing'); ?></h2>
 				<div class="gp-setup-next-steps-last mt-2 d-flex justify-content-between">
 						<a
 							class="btn btn-outline-primary btn-sm" href="https://docs.wpgetpaid.com/collection/114-getting-started?utm_source=setupwizard&utm_medium=product&utm_content=getting-started&utm_campaign=invoicingplugin"
-							target="_blank"><?php esc_html_e( 'Getting Started', 'invoicing' ); ?></a>
+							target="_blank"><?php esc_html_e('Getting Started', 'invoicing'); ?></a>
 						<a
 							class="btn btn-outline-primary btn-sm"
 							href="https://docs.wpgetpaid.com/?utm_source=setupwizard&utm_medium=product&utm_content=docs&utm_campaign=invoicingplugin"
-							target="_blank"><?php esc_html_e( 'Documentation', 'invoicing' ); ?></a>
+							target="_blank"><?php esc_html_e('Documentation', 'invoicing'); ?></a>
 						<a
 							class="btn btn-outline-primary btn-sm"
 							href="https://wpgetpaid.com/support/?utm_source=setupwizard&utm_medium=product&utm_content=docs&utm_campaign=invoicingyplugin"
-							target="_blank"><?php esc_html_e( 'Support', 'invoicing' ); ?></a>
+							target="_blank"><?php esc_html_e('Support', 'invoicing'); ?></a>
 						<a
 							class="btn btn-outline-primary btn-sm"
 							href="https://demos.ayecode.io/getpaid/?utm_source=setupwizard&utm_medium=product&utm_content=demos&utm_campaign=invoicingyplugin"
-							target="_blank"><?php esc_html_e( 'Demos', 'invoicing' ); ?></a>
+							target="_blank"><?php esc_html_e('Demos', 'invoicing'); ?></a>
 					</div>
 			</div>
 		</div>

includes/admin/views/wizard-introduction.php

Spacing +39 added lines, -39 removed lines

@@ -4,78 +4,78 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class="card shadow-sm my-5">
 
     <h1 class="h4 card-header bg-white border-bottom-0 pt-4 pb-1">
-        <?php esc_html_e( 'Welcome to the GetPaid Setup Wizard!', 'invoicing' ); ?>
+        <?php esc_html_e('Welcome to the GetPaid Setup Wizard!', 'invoicing'); ?>
     </h1>
 
     <div class="card-body text-muted ">
-        <p><?php esc_html_e( 'Thank you for choosing GetPaid - The most Powerful Payments Plugin for WordPress', 'invoicing' ); ?></p>
+        <p><?php esc_html_e('Thank you for choosing GetPaid - The most Powerful Payments Plugin for WordPress', 'invoicing'); ?></p>
         <hr class="mt-4 pt-3 pb-0" />
-        <p class="small"><?php echo wp_kses_post( __( 'This quick setup wizard will help you <b>configure the basic settings</b>. It’s <b>completely optional</b> and shouldn’t take longer than <b>five minutes</b>.', 'invoicing' ) ); ?></p>
+        <p class="small"><?php echo wp_kses_post(__('This quick setup wizard will help you <b>configure the basic settings</b>. It’s <b>completely optional</b> and shouldn’t take longer than <b>five minutes</b>.', 'invoicing')); ?></p>
     </div>
 
     <div class="card-footer mb-0 bg-white gp-setup-actions step border-top-0">
         <a
-            href="<?php echo esc_url( $next_url ); ?>"
-            class="btn btn-primary button-next"><?php esc_html_e( "Let's go!", 'invoicing' ); ?></a>
+            href="<?php echo esc_url($next_url); ?>"
+            class="btn btn-primary button-next"><?php esc_html_e("Let's go!", 'invoicing'); ?></a>
         <a
-            href="<?php echo esc_url( admin_url() ); ?>"
-            class="btn btn-link d-block mt-2 "><?php esc_html_e( 'Not right now', 'invoicing' ); ?></a>
+            href="<?php echo esc_url(admin_url()); ?>"
+            class="btn btn-link d-block mt-2 "><?php esc_html_e('Not right now', 'invoicing'); ?></a>
     </div>
 </div>
 
 <div class="card shadow-sm my-5 overflow-hidden">
     <h1 class="h4 card-header bg-white border-bottom-0  pt-4 pb-1">
-        <?php esc_html_e( 'GetPaid Features & Addons!', 'invoicing' ); ?>
+        <?php esc_html_e('GetPaid Features & Addons!', 'invoicing'); ?>
     </h1>
 
     <div class="card-body text-muted overflow-hidden">
-		<p><?php esc_html_e( 'Collect one time & recurring payments online within minutes. No complex setup required.', 'invoicing' ); ?></p>
+		<p><?php esc_html_e('Collect one time & recurring payments online within minutes. No complex setup required.', 'invoicing'); ?></p>
 		<hr>
 
 		<div class="row row-cols-2 text-left">
 			<div class="col mt-3">
 				<div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/buy.svg' ); ?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/buy.svg'); ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e( 'GetPaid via Buy Now Buttons', 'invoicing' ); ?></h6>
-                        <small><?php esc_html_e( 'Sell via buy now buttons anywhere on your site', 'invoicing' ); ?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e('GetPaid via Buy Now Buttons', 'invoicing'); ?></h6>
+                        <small><?php esc_html_e('Sell via buy now buttons anywhere on your site', 'invoicing'); ?></small>
                     </div>
                 </div>
 			</div>
 
             <div class="col mt-3">
                 <div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/report.svg' ); ?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/report.svg'); ?>" class="mr-3" alt="...">
                         <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e( 'GetPaid via payment form', 'invoicing' ); ?></h6>
-                        <small><?php esc_html_e( 'Payment forms are conversion-optimized checkout forms', 'invoicing' ); ?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e('GetPaid via payment form', 'invoicing'); ?></h6>
+                        <small><?php esc_html_e('Payment forms are conversion-optimized checkout forms', 'invoicing'); ?></small>
                     </div>
                 </div>
 		    </div>
 
             <div class="col mt-3">
                 <div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/invoices.svg' ); ?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/invoices.svg'); ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e( 'GetPaid via Invoice', 'invoicing' ); ?></h6>
-                        <small><?php esc_html_e( 'Create and send invoices for just about anything from the WordPress dashboard', 'invoicing' ); ?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e('GetPaid via Invoice', 'invoicing'); ?></h6>
+                        <small><?php esc_html_e('Create and send invoices for just about anything from the WordPress dashboard', 'invoicing'); ?></small>
                     </div>
                 </div>
 		    </div>
 
             <div class="col mt-3">
                 <div class="media">
-                    <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/payment.svg' ); ?>" class="mr-3" alt="...">
+                    <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/payment.svg'); ?>" class="mr-3" alt="...">
                     <div class="media-body">
-                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e( 'Affordable payment gateways', 'invoicing' ); ?></h6>
-                        <small><?php esc_html_e( 'On average our gateways are over 66% cheaper than our competition', 'invoicing' ); ?></small>
+                        <h6 class="mt-0 font-weight-bold"><?php esc_html_e('Affordable payment gateways', 'invoicing'); ?></h6>
+                        <small><?php esc_html_e('On average our gateways are over 66% cheaper than our competition', 'invoicing'); ?></small>
                     </div>
                 </div>
 		    </div>
@@ -86,51 +86,51 @@ 
 	<div class="mt-5">
 		<a
             href="https://wpgetpaid.com/features-list/"
-			class="btn btn-primary"><?php esc_html_e( 'View All Features!', 'invoicing' ); ?></a>
+			class="btn btn-primary"><?php esc_html_e('View All Features!', 'invoicing'); ?></a>
 	</div>
 
 	<div class="mt-5 mx-n4 py-4" style="background:#eafaf6;">
-		<h4 class="mt-0 font-weight-bold text-dark mb-4"><?php esc_html_e( 'More with Membership!', 'invoicing' ); ?></h4>
+		<h4 class="mt-0 font-weight-bold text-dark mb-4"><?php esc_html_e('More with Membership!', 'invoicing'); ?></h4>
 		<div class="row row-cols-2 text-left px-5">
 
 			<div class="col">
 				<ul class="list-unstyled">
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'PDF Invoices', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Gravity Forms', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Contact form 7', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'AffiliateWP Integration', 'invoicing' ); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('PDF Invoices', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Gravity Forms', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Contact form 7', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('AffiliateWP Integration', 'invoicing'); ?></li>
 				</ul>
 			</div>
 
 			<div class="col">
 				<ul class="list-unstyled">
-			    	<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Ninja forms', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Digital Downloads', 'invoicing' ); ?></li>
-					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e( 'Wallet', 'invoicing' ); ?></li>
+			    	<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Ninja forms', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Digital Downloads', 'invoicing'); ?></li>
+					<li class="my-2"><i class="far fa-check-circle text-success"></i> <?php esc_html_e('Wallet', 'invoicing'); ?></li>
 				</ul>
 			</div>
 		</div>
 
-		<h5 class="mt-4 font-weight-bold text-dark mb-3"><?php esc_html_e( 'Membership Starts From', 'invoicing' ); ?></h5>
-		<h1 class="mt-0 font-weight-bold text-dark mb-4 display-3"><?php esc_html_e( '$49', 'invoicing' ); ?></h1>
+		<h5 class="mt-4 font-weight-bold text-dark mb-3"><?php esc_html_e('Membership Starts From', 'invoicing'); ?></h5>
+		<h1 class="mt-0 font-weight-bold text-dark mb-4 display-3"><?php esc_html_e('$49', 'invoicing'); ?></h1>
 
 		<div class="mt-2">
 			<a
                 href="https://wpgetpaid.com/downloads/membership/"
-				class="btn btn-primary"><?php esc_html_e( 'Buy Membership Now!', 'invoicing' ); ?></a>
+				class="btn btn-primary"><?php esc_html_e('Buy Membership Now!', 'invoicing'); ?></a>
 		</div>
 
 	</div>
 
     <div class="card-footer mb-0 bg-white gp-setup-actions step border-top-0">
         <a
-            href="<?php echo esc_url( $next_url ); ?>"
-            class="btn btn-outline-primary button-next"><?php esc_html_e( 'Launch the Setup Wizard!', 'invoicing' ); ?></a>
+            href="<?php echo esc_url($next_url); ?>"
+            class="btn btn-outline-primary button-next"><?php esc_html_e('Launch the Setup Wizard!', 'invoicing'); ?></a>
         <a
             href="https://docs.wpgetpaid.com/"
-            class="btn btn-outline-primary ml-4"><?php esc_html_e( 'Documentation', 'invoicing' ); ?></a>
+            class="btn btn-outline-primary ml-4"><?php esc_html_e('Documentation', 'invoicing'); ?></a>
         <a
-            href="<?php echo esc_url( admin_url() ); ?>"
-            class="btn btn-link d-block mt-2 "><?php esc_html_e( 'Not right now', 'invoicing' ); ?></a>
+            href="<?php echo esc_url(admin_url()); ?>"
+            class="btn btn-link d-block mt-2 "><?php esc_html_e('Not right now', 'invoicing'); ?></a>
     </div>
 </div>