AyeCode / invoicing

includes/wpinv-address-functions.php

Indentation +88 added lines, -88 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 /**
@@ -36,7 +36,7 @@ 
  */
 function wpinv_sanitize_country( $country ) {
 
-	// Enure the country is specified
+    // Enure the country is specified
     if ( empty( $country ) ) {
         $country = wpinv_get_default_country();
     }
@@ -66,9 +66,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+    $state = wpinv_get_option( 'default_state', '' );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -305,11 +305,11 @@ 
 
     $country = wpinv_sanitize_country( $country );
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
-			return $continent_code;
-		}
-	}
+    foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
+        if ( false !== array_search( $country, $countries, true ) ) {
+            return $continent_code;
+        }
+    }
 
     return '';
     
@@ -601,33 +601,33 @@ 
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if( !empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
 
         $class  = isset( $_POST['class'] ) ? esc_attr( $_POST['class'] ) : '';
         $class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
 
         $args  = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => implode( ' ', array_unique( explode( ' ', $class ) ) ),
-			'options' => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false
-		);
-
-		$response = wpinv_html_select( $args );
-
-	} else {
-		$response = 'nostates';
-	}
+            'name'    => $sanitized_field_name,
+            'id'      => $sanitized_field_name,
+            'class'   => implode( ' ', array_unique( explode( ' ', $class ) ) ),
+            'options' => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false
+        );
+
+        $response = wpinv_html_select( $args );
+
+    } else {
+        $response = 'nostates';
+    }
 
-	return $response;
+    return $response;
 }
 
 function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
@@ -645,46 +645,46 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
-			array(
-				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
-				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
-				'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
-				'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
-				'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
-				'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
-				'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
-				'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
-				'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
-				'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
-				'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
-				'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
-				'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
-				'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
-				'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
-				'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
-				'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
-				'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
-			)
-		);
+        return apply_filters( 'wpinv_localisation_address_formats',
+            array(
+                'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
+                'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
+                'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
+                'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
+                'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
+                'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
+                'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
+                'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
+                'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
+                'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
+                'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
+                'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
+                'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
+                'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
+                'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
+                'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
+                'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
+                'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
+            )
+        );
 }
 
 /**
@@ -701,21 +701,21 @@ 
     }
 
     // Get all formats.
-	$formats = wpinv_get_address_formats();
+    $formats = wpinv_get_address_formats();
 
-	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+    // Get format for the specified country.
+    $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
     
     /**
-	 * Filters the address format to use on Invoices.
+     * Filters the address format to use on Invoices.
      * 
      * New lines will be replaced by a `br` element. Double new lines will be replaced by a paragraph. HTML tags are allowed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $format  The address format to use.
+     *
+     * @since 1.0.13
+     *
+     * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
-	 */
+     */
     return apply_filters( 'wpinv_get_full_address_format', $format, $country );
 }
 
@@ -736,8 +736,8 @@ 
         'country'           => '',
         'zip'               => '',
         'first_name'        => '',
-		'last_name'         => '',
-		'company'           => '',
+        'last_name'         => '',
+        'company'           => '',
     );
 
     $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
@@ -758,14 +758,14 @@ 
     $args['country_code']= $country;
 
     /**
-	 * Filters the address format replacements to use on Invoices.
+     * Filters the address format replacements to use on Invoices.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param array $replacements  The address replacements to use.
+     *
+     * @since 1.0.13
+     *
+     * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
-	 */
+     */
     $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
 
     $return = array();
@@ -788,5 +788,5 @@ 
  * @return string
  */
 function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+    return trim( $line, ', ' );
 }
\ No newline at end of file

Spacing +143 added lines, -143 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+	$country = wpinv_get_option('default_country', 'UK');
 
-	return apply_filters( 'wpinv_default_country', $country );
+	return apply_filters('wpinv_default_country', $country);
 }
 
 /**
@@ -23,8 +23,8 @@ 
  *
  * @return string
  */
-function getpaid_get_ip_country( $ip_address = '' ) {
-    $country = GetPaid_Geolocation::geolocate_ip( $ip_address, true );
+function getpaid_get_ip_country($ip_address = '') {
+    $country = GetPaid_Geolocation::geolocate_ip($ip_address, true);
     return $country['country'];
 }
 
@@ -34,59 +34,59 @@ 
  * @param string $country The country code to sanitize
  * @return array
  */
-function wpinv_sanitize_country( $country ) {
+function wpinv_sanitize_country($country) {
 
 	// Enure the country is specified
-    if ( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
-    return trim( wpinv_utf8_strtoupper( $country ) );
+    return trim(wpinv_utf8_strtoupper($country));
 
 }
 
-function wpinv_is_base_country( $country ) {
+function wpinv_is_base_country($country) {
     $base_country = wpinv_get_default_country();
     
-    if ( $base_country === 'UK' ) {
+    if ($base_country === 'UK') {
         $base_country = 'GB';
     }
-    if ( $country == 'UK' ) {
+    if ($country == 'UK') {
         $country = 'GB';
     }
 
-    return ( $country && $country === $base_country ) ? true : false;
+    return ($country && $country === $base_country) ? true : false;
 }
 
-function wpinv_country_name( $country_code = '' ) { 
+function wpinv_country_name($country_code = '') { 
     $countries = wpinv_get_country_list();
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
-    $country = isset( $countries[$country_code] ) ? $countries[$country_code] : $country_code;
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
 
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
+    return apply_filters('wpinv_country_name', $country, $country_code);
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+	$state = wpinv_get_option('default_state', '');
 
-	return apply_filters( 'wpinv_default_state', $state );
+	return apply_filters('wpinv_default_state', $state);
 }
 
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
+function wpinv_state_name($state_code = '', $country_code = '') {
     $state = $state_code;
     
-    if ( !empty( $country_code ) ) {
-        $states = wpinv_get_country_states( $country_code );
+    if (!empty($country_code)) {
+        $states = wpinv_get_country_states($country_code);
         
-        $state = !empty( $states ) && isset( $states[$state_code] ) ? $states[$state_code] : $state;
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
     }
 
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
 }
 
 function wpinv_store_address() {
-    $address = wpinv_get_option( 'store_address', '' );
+    $address = wpinv_get_option('store_address', '');
 
-    return apply_filters( 'wpinv_store_address', $address );
+    return apply_filters('wpinv_store_address', $address);
 }
 
 /**
@@ -94,24 +94,24 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_maybe_add_default_address( &$invoice ) {
+function getpaid_maybe_add_default_address(&$invoice) {
 
     $user_id = $invoice->get_user_id();
 
     // Abort if the invoice belongs to no one.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
         return;
     }
 
     // Fill in defaults whenever necessary.
-    foreach ( wpinv_get_user_address( $user_id ) as $key => $value ) {
+    foreach (wpinv_get_user_address($user_id) as $key => $value) {
 
-        if ( is_callable( $invoice, "get_$key" ) ) {
-            $current = call_user_func( array( $invoice, "get_$key" ) );
+        if (is_callable($invoice, "get_$key")) {
+            $current = call_user_func(array($invoice, "get_$key"));
 
-            if ( empty( $current ) ) {
+            if (empty($current)) {
                 $method = "set_$key";
-                $invoice->$method( $value );
+                $invoice->$method($value);
             }
 
         }
@@ -130,21 +130,21 @@ 
     $address_fields = apply_filters(
         'getpaid_user_address_fields',
         array(
-            'first_name' => __( 'First Name', 'invoicing' ),
-            'last_name'  => __( 'Last Name', 'invoicing' ),
-            'address'    => __( 'Address', 'invoicing' ),
-            'city'       => __( 'City', 'invoicing' ),
-            'country'    => __( 'Country', 'invoicing' ),
-            'state'      => __( 'State', 'invoicing' ),
-            'zip'        => __( 'Zip/Postal Code', 'invoicing' ),
-            'phone'      => __( 'Phone Number', 'invoicing' ),
-            'company'    => __( 'Company', 'invoicing' ),
-            'vat_number' => __( 'VAT Number', 'invoicing' ),
+            'first_name' => __('First Name', 'invoicing'),
+            'last_name'  => __('Last Name', 'invoicing'),
+            'address'    => __('Address', 'invoicing'),
+            'city'       => __('City', 'invoicing'),
+            'country'    => __('Country', 'invoicing'),
+            'state'      => __('State', 'invoicing'),
+            'zip'        => __('Zip/Postal Code', 'invoicing'),
+            'phone'      => __('Phone Number', 'invoicing'),
+            'company'    => __('Company', 'invoicing'),
+            'vat_number' => __('VAT Number', 'invoicing'),
         )
     );
 
-    if ( ! wpinv_use_taxes() && isset( $address_fields['vat_number'] ) ) {
-        unset( $address_fields['vat_number'] );
+    if (!wpinv_use_taxes() && isset($address_fields['vat_number'])) {
+        unset($address_fields['vat_number']);
     }
 
     return $address_fields;
@@ -155,8 +155,8 @@ 
  * 
  * @return bool
  */
-function getpaid_is_address_field_whitelisted( $key ) {
-    return array_key_exists( $key, getpaid_user_address_fields() );
+function getpaid_is_address_field_whitelisted($key) {
+    return array_key_exists($key, getpaid_user_address_fields());
 }
 
 /**
@@ -166,24 +166,24 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_save_invoice_user_address( $invoice ) {
+function getpaid_save_invoice_user_address($invoice) {
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
+    $invoice = wpinv_get_invoice($invoice);
 
     // Abort if it does not exist.
-    if ( empty( $invoice ) || $invoice->is_renewal() ) {
+    if (empty($invoice) || $invoice->is_renewal()) {
         return;
     }
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( is_callable( array( $invoice, "get_$field" ) ) ) {
-            $value = call_user_func( array( $invoice, "get_$field" ) );
+        if (is_callable(array($invoice, "get_$field"))) {
+            $value = call_user_func(array($invoice, "get_$field"));
 
             // Only save if it is not empty.
-            if ( ! empty( $value ) ) {
-                update_user_meta( $invoice->get_user_id(), '_wpinv_' . $field, $value );
+            if (!empty($value)) {
+                update_user_meta($invoice->get_user_id(), '_wpinv_' . $field, $value);
             }
 
         }
@@ -191,7 +191,7 @@ 
     }
 
 }
-add_action( 'getpaid_checkout_invoice_updated', 'getpaid_save_invoice_user_address' );
+add_action('getpaid_checkout_invoice_updated', 'getpaid_save_invoice_user_address');
 
 /**
  * Retrieves a saved user address.
@@ -200,14 +200,14 @@ 
  * @param bool $with_default Whether or not we should use the default country and state.
  * @return array
  */
-function wpinv_get_user_address( $user_id = 0, $with_default = true ) {
+function wpinv_get_user_address($user_id = 0, $with_default = true) {
 
     // Prepare the user id.
-    $user_id   = empty( $user_id ) ? get_current_user_id() : $user_id;
-    $user_info = get_userdata( $user_id );
+    $user_id   = empty($user_id) ? get_current_user_id() : $user_id;
+    $user_info = get_userdata($user_id);
 
     // Abort if non exists.
-    if ( empty( $user_info ) ) {
+    if (empty($user_info)) {
         return array();
     }
 
@@ -217,11 +217,11 @@ 
         'email'   => $user_info->user_email,
     );
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
-        $address[$field] = getpaid_get_user_address_field( $user_id, $field );
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
+        $address[$field] = getpaid_get_user_address_field($user_id, $field);
     }
 
-    if ( ! $with_default ) {
+    if (!$with_default) {
         return $address;
     }
 
@@ -232,7 +232,7 @@ 
         'country'    => wpinv_get_default_country(),
     );
 
-    return getpaid_array_merge_if_empty( $address, $defaults );
+    return getpaid_array_merge_if_empty($address, $defaults);
 
 }
 
@@ -243,7 +243,7 @@ 
  * @param string $field The field to use.
  * @return string|null
  */
-function getpaid_get_user_address_field( $user_id, $field ) {
+function getpaid_get_user_address_field($user_id, $field) {
 
     $prefixes = array(
         '_wpinv_',
@@ -251,15 +251,15 @@ 
         ''
     );
 
-    foreach ( $prefixes as $prefix ) {
+    foreach ($prefixes as $prefix) {
 
         // Meta table.
-        $value = get_user_meta( $user_id, $prefix . $field, true );
+        $value = get_user_meta($user_id, $prefix . $field, true);
         
         // UWP table.
-        $value = ( empty( $value ) && function_exists( 'uwp_get_usermeta' ) ) ? uwp_get_usermeta( $user_id, $prefix . $field ) : $value;
+        $value = (empty($value) && function_exists('uwp_get_usermeta')) ? uwp_get_usermeta($user_id, $prefix . $field) : $value;
 
-        if ( ! empty( $value ) ) {
+        if (!empty($value)) {
             return $value;
         }
 
@@ -276,16 +276,16 @@ 
  * @param string $return What to return.
  * @return array
  */
-function wpinv_get_continents( $return = 'all' ) {
+function wpinv_get_continents($return = 'all') {
 
-    $continents = wpinv_get_data( 'continents' );
+    $continents = wpinv_get_data('continents');
 
-    switch( $return ) {
+    switch ($return) {
         case 'name' :
-            return wp_list_pluck( $continents, 'name' );
+            return wp_list_pluck($continents, 'name');
             break;
         case 'countries' :
-            return wp_list_pluck( $continents, 'countries' );
+            return wp_list_pluck($continents, 'countries');
             break;
         default :
             return $continents;
@@ -301,12 +301,12 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return string
  */
-function wpinv_get_continent_code_for_country( $country = false ) {
+function wpinv_get_continent_code_for_country($country = false) {
 
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
+	foreach (wpinv_get_continents('countries') as $continent_code => $countries) {
+		if (false !== array_search($country, $countries, true)) {
 			return $continent_code;
 		}
 	}
@@ -322,13 +322,13 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return array
  */
-function wpinv_get_country_calling_code( $country = null) {
+function wpinv_get_country_calling_code($country = null) {
 
-    $country = wpinv_sanitize_country( $country );
-    $codes   = wpinv_get_data( 'phone-codes' );
-    $code    = isset( $codes[ $country ] ) ? $codes[ $country ] : '';
+    $country = wpinv_sanitize_country($country);
+    $codes   = wpinv_get_data('phone-codes');
+    $code    = isset($codes[$country]) ? $codes[$country] : '';
 
-    if ( is_array( $code ) ) {
+    if (is_array($code)) {
         return $code[0];
     }
     return $code;
@@ -341,8 +341,8 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_list( $first_empty = false ) {
-    return wpinv_maybe_add_empty_option( apply_filters( 'wpinv_countries', wpinv_get_data( 'countries' ) ), $first_empty );
+function wpinv_get_country_list($first_empty = false) {
+    return wpinv_maybe_add_empty_option(apply_filters('wpinv_countries', wpinv_get_data('countries')), $first_empty);
 }
 
 /**
@@ -352,22 +352,22 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
+function wpinv_get_country_states($country = null, $first_empty = false) {
     
     // Prepare the country.
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
 
     // Fetch all states.
-    $all_states = wpinv_get_data( 'states' );
+    $all_states = wpinv_get_data('states');
 
     // Fetch the specified country's states.
-    $states     = isset( $all_states[ $country ] ) ? $all_states[ $country ] : array() ;
-    $states     = apply_filters( "wpinv_{$country}_states", $states );
-    $states     = apply_filters( 'wpinv_country_states', $states, $country );
+    $states     = isset($all_states[$country]) ? $all_states[$country] : array();
+    $states     = apply_filters("wpinv_{$country}_states", $states);
+    $states     = apply_filters('wpinv_country_states', $states, $country);
 
-    asort( $states );
+    asort($states);
      
-    return wpinv_maybe_add_empty_option( $states, $first_empty );
+    return wpinv_maybe_add_empty_option($states, $first_empty);
 }
 
 /**
@@ -377,7 +377,7 @@ 
  * @return array
  */
 function wpinv_get_us_states_list() {
-    return apply_filters( 'wpinv_usa_states', wpinv_get_country_states( 'US' ) );
+    return apply_filters('wpinv_usa_states', wpinv_get_country_states('US'));
 }
 
 /**
@@ -387,7 +387,7 @@ 
  * @return array
  */
 function wpinv_get_canada_states_list() {
-    return apply_filters( 'wpinv_canada_provinces', wpinv_get_country_states( 'CA' ) );
+    return apply_filters('wpinv_canada_provinces', wpinv_get_country_states('CA'));
 }
 
 /**
@@ -397,7 +397,7 @@ 
  * @return array
  */
 function wpinv_get_australia_states_list() {
-    return apply_filters( 'wpinv_australia_states', wpinv_get_country_states( 'AU' ) );
+    return apply_filters('wpinv_australia_states', wpinv_get_country_states('AU'));
 }
 
 /**
@@ -407,7 +407,7 @@ 
  * @return array
  */
 function wpinv_get_bangladesh_states_list() {
-    return apply_filters( 'wpinv_bangladesh_states', wpinv_get_country_states( 'BD' ) );
+    return apply_filters('wpinv_bangladesh_states', wpinv_get_country_states('BD'));
 }
 
 /**
@@ -417,7 +417,7 @@ 
  * @return array
  */
 function wpinv_get_brazil_states_list() {
-    return apply_filters( 'wpinv_brazil_states', wpinv_get_country_states( 'BR' ) );
+    return apply_filters('wpinv_brazil_states', wpinv_get_country_states('BR'));
 }
 
 /**
@@ -427,7 +427,7 @@ 
  * @return array
  */
 function wpinv_get_bulgaria_states_list() {
-    return apply_filters( 'wpinv_bulgaria_states', wpinv_get_country_states( 'BG' ) );
+    return apply_filters('wpinv_bulgaria_states', wpinv_get_country_states('BG'));
 }
 
 /**
@@ -437,7 +437,7 @@ 
  * @return array
  */
 function wpinv_get_hong_kong_states_list() {
-    return apply_filters( 'wpinv_hong_kong_states', wpinv_get_country_states( 'HK' ) );
+    return apply_filters('wpinv_hong_kong_states', wpinv_get_country_states('HK'));
 }
 
 /**
@@ -447,7 +447,7 @@ 
  * @return array
  */
 function wpinv_get_hungary_states_list() {
-    return apply_filters( 'wpinv_hungary_states', wpinv_get_country_states( 'HU' ) );
+    return apply_filters('wpinv_hungary_states', wpinv_get_country_states('HU'));
 }
 
 /**
@@ -457,7 +457,7 @@ 
  * @return array
  */
 function wpinv_get_japan_states_list() {
-    return apply_filters( 'wpinv_japan_states', wpinv_get_country_states( 'JP' ) );
+    return apply_filters('wpinv_japan_states', wpinv_get_country_states('JP'));
 }
 
 /**
@@ -467,7 +467,7 @@ 
  * @return array
  */
 function wpinv_get_china_states_list() {
-    return apply_filters( 'wpinv_china_states', wpinv_get_country_states( 'CN' ) );
+    return apply_filters('wpinv_china_states', wpinv_get_country_states('CN'));
 }
 
 /**
@@ -477,7 +477,7 @@ 
  * @return array
  */
 function wpinv_get_new_zealand_states_list() {
-    return apply_filters( 'wpinv_new_zealand_states', wpinv_get_country_states( 'NZ' ) );
+    return apply_filters('wpinv_new_zealand_states', wpinv_get_country_states('NZ'));
 }
 
 /**
@@ -487,7 +487,7 @@ 
  * @return array
  */
 function wpinv_get_peru_states_list() {
-    return apply_filters( 'wpinv_peru_states', wpinv_get_country_states( 'PE' ) );
+    return apply_filters('wpinv_peru_states', wpinv_get_country_states('PE'));
 }
 
 /**
@@ -497,7 +497,7 @@ 
  * @return array
  */
 function wpinv_get_indonesia_states_list() {
-    return apply_filters( 'wpinv_indonesia_states', wpinv_get_country_states( 'ID' ) );
+    return apply_filters('wpinv_indonesia_states', wpinv_get_country_states('ID'));
 }
 
 /**
@@ -507,7 +507,7 @@ 
  * @return array
  */
 function wpinv_get_india_states_list() {
-    return apply_filters( 'wpinv_india_states', wpinv_get_country_states( 'IN' ) );
+    return apply_filters('wpinv_india_states', wpinv_get_country_states('IN'));
 }
 
 /**
@@ -517,7 +517,7 @@ 
  * @return array
  */
 function wpinv_get_iran_states_list() {
-    return apply_filters( 'wpinv_iran_states', wpinv_get_country_states( 'IR' ) );
+    return apply_filters('wpinv_iran_states', wpinv_get_country_states('IR'));
 }
 
 /**
@@ -527,7 +527,7 @@ 
  * @return array
  */
 function wpinv_get_italy_states_list() {
-    return apply_filters( 'wpinv_italy_states', wpinv_get_country_states( 'IT' ) );
+    return apply_filters('wpinv_italy_states', wpinv_get_country_states('IT'));
 }
 
 /**
@@ -537,7 +537,7 @@ 
  * @return array
  */
 function wpinv_get_malaysia_states_list() {
-    return apply_filters( 'wpinv_malaysia_states', wpinv_get_country_states( 'MY' ) );
+    return apply_filters('wpinv_malaysia_states', wpinv_get_country_states('MY'));
 }
 
 /**
@@ -547,7 +547,7 @@ 
  * @return array
  */
 function wpinv_get_mexico_states_list() {
-    return apply_filters( 'wpinv_mexico_states', wpinv_get_country_states( 'MX' ) );
+    return apply_filters('wpinv_mexico_states', wpinv_get_country_states('MX'));
 }
 
 /**
@@ -557,7 +557,7 @@ 
  * @return array
  */
 function wpinv_get_nepal_states_list() {
-    return apply_filters( 'wpinv_nepal_states', wpinv_get_country_states( 'NP' ) );
+    return apply_filters('wpinv_nepal_states', wpinv_get_country_states('NP'));
 }
 
 /**
@@ -567,7 +567,7 @@ 
  * @return array
  */
 function wpinv_get_south_africa_states_list() {
-    return apply_filters( 'wpinv_south_africa_states', wpinv_get_country_states( 'ZA' ) );
+    return apply_filters('wpinv_south_africa_states', wpinv_get_country_states('ZA'));
 }
 
 /**
@@ -577,7 +577,7 @@ 
  * @return array
  */
 function wpinv_get_thailand_states_list() {
-    return apply_filters( 'wpinv_thailand_states', wpinv_get_country_states( 'TH' ) );
+    return apply_filters('wpinv_thailand_states', wpinv_get_country_states('TH'));
 }
 
 /**
@@ -587,7 +587,7 @@ 
  * @return array
  */
 function wpinv_get_turkey_states_list() {
-    return apply_filters( 'wpinv_turkey_states', wpinv_get_country_states( 'TR' ) );
+    return apply_filters('wpinv_turkey_states', wpinv_get_country_states('TR'));
 }
 
 /**
@@ -597,31 +597,31 @@ 
  * @return array
  */
 function wpinv_get_spain_states_list() {
-    return apply_filters( 'wpinv_spain_states', wpinv_get_country_states( 'ES' ) );
+    return apply_filters('wpinv_spain_states', wpinv_get_country_states('ES'));
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = wpinv_get_default_country();
 	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+	if (!empty($states)) {
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
 
-        $class  = isset( $_POST['class'] ) ? esc_attr( $_POST['class'] ) : '';
+        $class  = isset($_POST['class']) ? esc_attr($_POST['class']) : '';
         $class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
 
-        $args  = array(
+        $args = array(
 			'name'    => $sanitized_field_name,
 			'id'      => $sanitized_field_name,
-			'class'   => implode( ' ', array_unique( explode( ' ', $class ) ) ),
-			'options' => array_merge( array( '' => '' ), $states ),
+			'class'   => implode(' ', array_unique(explode(' ', $class))),
+			'options' => array_merge(array('' => ''), $states),
 			'show_option_all'  => false,
 			'show_option_none' => false
 		);
 
-		$response = wpinv_html_select( $args );
+		$response = wpinv_html_select($args);
 
 	} else {
 		$response = 'nostates';
@@ -630,10 +630,10 @@ 
 	return $response;
 }
 
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
-    $country = !empty( $country ) ? $country : wpinv_get_default_country();
+function wpinv_default_billing_country($country = '', $user_id = 0) {
+    $country = !empty($country) ? $country : wpinv_get_default_country();
     
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
 }
 
 /**
@@ -645,7 +645,7 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
+		return apply_filters('wpinv_localisation_address_formats',
 			array(
 				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
 				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
@@ -694,9 +694,9 @@ 
  * @see `wpinv_get_invoice_address_replacements`
  * @return string
  */
-function wpinv_get_full_address_format( $country = false) {
+function wpinv_get_full_address_format($country = false) {
 
-    if( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
 
@@ -704,7 +704,7 @@ 
 	$formats = wpinv_get_address_formats();
 
 	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+	$format = ($country && isset($formats[$country])) ? $formats[$country] : $formats['default'];
     
     /**
 	 * Filters the address format to use on Invoices.
@@ -716,7 +716,7 @@ 
 	 * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
 	 */
-    return apply_filters( 'wpinv_get_full_address_format', $format, $country );
+    return apply_filters('wpinv_get_full_address_format', $format, $country);
 }
 
 /**
@@ -727,7 +727,7 @@ 
  * @param array $billing_details customer's billing details
  * @return array
  */
-function wpinv_get_invoice_address_replacements( $billing_details ) {
+function wpinv_get_invoice_address_replacements($billing_details) {
 
     $default_args = array(
         'address'           => '',
@@ -740,22 +740,22 @@ 
 		'company'           => '',
     );
 
-    $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
+    $args    = map_deep(wp_parse_args($billing_details, $default_args), 'trim');
     $state   = $args['state'];
     $country = $args['country'];
 
     // Handle full country name.
-    $full_country = empty( $country ) ? $country : wpinv_country_name( $country );
+    $full_country = empty($country) ? $country : wpinv_country_name($country);
 
     // Handle full state name.
-    $full_state   = ( $country && $state ) ?  wpinv_state_name( $state, $country ) : $state;
+    $full_state   = ($country && $state) ?  wpinv_state_name($state, $country) : $state;
 
     $args['postcode']    = $args['zip'];
     $args['name']        = $args['first_name'] . ' ' . $args['last_name'];
     $args['state']       = $full_state;
     $args['state_code']  = $state;
     $args['country']     = $full_country;
-    $args['country_code']= $country;
+    $args['country_code'] = $country;
 
     /**
 	 * Filters the address format replacements to use on Invoices.
@@ -766,14 +766,14 @@ 
 	 * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
 	 */
-    $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
+    $replacements = apply_filters('wpinv_get_invoice_address_replacements', $args, $billing_details);
 
     $return = array();
 
-    foreach( $replacements as $key => $value ) {
-        $value  = is_scalar( $value ) ? trim( sanitize_text_field( $value ) ) : '';
+    foreach ($replacements as $key => $value) {
+        $value = is_scalar($value) ? trim(sanitize_text_field($value)) : '';
         $return['{{' . $key . '}}'] = $value;
-        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper( $value );
+        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper($value);
     }
 
     return $return;
@@ -787,6 +787,6 @@ 
  * @since 1.0.14
  * @return string
  */
-function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+function wpinv_trim_formatted_address_line($line) {
+	return trim($line, ', ');
 }
\ No newline at end of file

includes/admin/class-getpaid-admin-setup-wizard.php

Indentation +444 added lines, -444 removed lines

@@ -11,7 +11,7 @@ 
  * @info        GetPaid Setup Wizard.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -19,85 +19,85 @@ 
  */
 class GetPaid_Admin_Setup_Wizard {
 
-	/** @var string Current Step */
-	private $step = '';
-
-	/** @var array Steps for the setup wizard */
-	private $steps = array();
-
-	/**
-	 * Hook in tabs.
-	 */
-	public function __construct() {
-		if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && current_user_can( 'manage_options' ) ) {
-			add_action( 'admin_menu', array( $this, 'admin_menus' ) );
-			add_action( 'current_screen', array( $this, 'setup_wizard' ) );
-
-			// add default content action
-			add_action( 'geodir_wizard_content_dummy_data', array( __CLASS__, 'content_dummy_data' ) );
-			add_action( 'geodir_wizard_content_sidebars', array( __CLASS__, 'content_sidebars' ) );
-			add_action( 'geodir_wizard_content_menus', array( __CLASS__, 'content_menus' ) );
-		}
-	}
-
-	/**
-	 * Add admin menus/screens.
-	 */
-	public function admin_menus() {
-		add_dashboard_page( '', '', 'manage_options', 'gp-setup', '' );
-	}
-
-	/**
-	 * Show the setup wizard.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_wizard() {
-		if ( empty( $_GET['page'] ) || 'gp-setup' !== $_GET['page'] ) {
-			return;
-		}
-		$default_steps = array(
-			'introduction'     => array(
-				'name'    => __( 'Introduction', 'invoicing' ),
-				'view'    => array( $this, 'setup_introduction' ),
-				'handler' => '',
-			),
-			'business_details'             => array(
-				'name'    => __( "Business Details", 'invoicing' ),
-				'view'    => array( $this, 'setup_business' ),
-				'handler' => array( $this, 'setup_business_save' ),
-			),
-			'currency' => array(
-				'name'    => __( 'Currency', 'invoicing' ),
-				'view'    => array( $this, 'setup_currency' ),
-				'handler' => array( $this, 'setup_currency_save' ),
-			),
-			'payments'        => array(
-				'name'    => __( 'Payment Gateways', 'invoicing' ),
-				'view'    => array( $this, 'setup_payments' ),
-				'handler' => array( $this, 'setup_payments_save' ),
-			),
-			'recommend'          => array(
-				'name'    => __( 'Recommend', 'invoicing' ),
-				'view'    => array( $this, 'setup_recommend' ),
-				'handler' => array( $this, 'setup_recommend_save' ),
-			),
-			'next_steps'       => array(
-				'name'    => __( 'Get Paid', 'invoicing' ),
-				'view'    => array( $this, 'setup_ready' ),
-				'handler' => '',
-			),
-		);
-
-		$this->steps     = apply_filters( 'getpaid_setup_wizard_steps', $default_steps );
-		$this->step      = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : current( array_keys( $this->steps ) );
-
-
-		// enqueue the script
-		$aui_settings = AyeCode_UI_Settings::instance();
-		$aui_settings->enqueue_scripts();
-		$aui_settings->enqueue_style();
-		getpaid_admin()->enqeue_scripts();
+    /** @var string Current Step */
+    private $step = '';
+
+    /** @var array Steps for the setup wizard */
+    private $steps = array();
+
+    /**
+     * Hook in tabs.
+     */
+    public function __construct() {
+        if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && current_user_can( 'manage_options' ) ) {
+            add_action( 'admin_menu', array( $this, 'admin_menus' ) );
+            add_action( 'current_screen', array( $this, 'setup_wizard' ) );
+
+            // add default content action
+            add_action( 'geodir_wizard_content_dummy_data', array( __CLASS__, 'content_dummy_data' ) );
+            add_action( 'geodir_wizard_content_sidebars', array( __CLASS__, 'content_sidebars' ) );
+            add_action( 'geodir_wizard_content_menus', array( __CLASS__, 'content_menus' ) );
+        }
+    }
+
+    /**
+     * Add admin menus/screens.
+     */
+    public function admin_menus() {
+        add_dashboard_page( '', '', 'manage_options', 'gp-setup', '' );
+    }
+
+    /**
+     * Show the setup wizard.
+     *
+     * @since 2.0.0
+     */
+    public function setup_wizard() {
+        if ( empty( $_GET['page'] ) || 'gp-setup' !== $_GET['page'] ) {
+            return;
+        }
+        $default_steps = array(
+            'introduction'     => array(
+                'name'    => __( 'Introduction', 'invoicing' ),
+                'view'    => array( $this, 'setup_introduction' ),
+                'handler' => '',
+            ),
+            'business_details'             => array(
+                'name'    => __( "Business Details", 'invoicing' ),
+                'view'    => array( $this, 'setup_business' ),
+                'handler' => array( $this, 'setup_business_save' ),
+            ),
+            'currency' => array(
+                'name'    => __( 'Currency', 'invoicing' ),
+                'view'    => array( $this, 'setup_currency' ),
+                'handler' => array( $this, 'setup_currency_save' ),
+            ),
+            'payments'        => array(
+                'name'    => __( 'Payment Gateways', 'invoicing' ),
+                'view'    => array( $this, 'setup_payments' ),
+                'handler' => array( $this, 'setup_payments_save' ),
+            ),
+            'recommend'          => array(
+                'name'    => __( 'Recommend', 'invoicing' ),
+                'view'    => array( $this, 'setup_recommend' ),
+                'handler' => array( $this, 'setup_recommend_save' ),
+            ),
+            'next_steps'       => array(
+                'name'    => __( 'Get Paid', 'invoicing' ),
+                'view'    => array( $this, 'setup_ready' ),
+                'handler' => '',
+            ),
+        );
+
+        $this->steps     = apply_filters( 'getpaid_setup_wizard_steps', $default_steps );
+        $this->step      = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : current( array_keys( $this->steps ) );
+
+
+        // enqueue the script
+        $aui_settings = AyeCode_UI_Settings::instance();
+        $aui_settings->enqueue_scripts();
+        $aui_settings->enqueue_style();
+        getpaid_admin()->enqeue_scripts();
 
 
 //		if ( ! empty( $_POST['save_step'] ) && isset( $this->steps[ $this->step ]['handler'] ) ) {
@@ -108,21 +108,21 @@ 
 //			call_user_func( $this->steps[ $this->step ]['handler'], $this );
 //		}
 
-		ob_start();
-		$this->setup_wizard_header();
+        ob_start();
+        $this->setup_wizard_header();
 //		$this->setup_wizard_steps();
-		$this->setup_wizard_content();
-		$this->setup_wizard_footer();
-		exit;
-	}
-
-	/**
-	 * Setup Wizard Header.
-	 *
-	 * @since 2.0.0
-	 */
+        $this->setup_wizard_content();
+        $this->setup_wizard_footer();
+        exit;
+    }
+
+    /**
+     * Setup Wizard Header.
+     *
+     * @since 2.0.0
+     */
 public function setup_wizard_header() {
-	?>
+    ?>
 	<!DOCTYPE html>
 	<html <?php language_attributes(); ?> class="bsui">
 	<head>
@@ -131,13 +131,13 @@ 
 		<title><?php esc_html_e( 'GetPaid &rsaquo; Setup Wizard', 'invoicing' ); ?></title>
 		<?php
 
-		wp_register_style( 'font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(  ), WPINV_VERSION );
-		wp_enqueue_style( 'font-awesome' );
-		do_action( 'admin_print_styles' );
-		wp_print_styles( 'select2' );
-		wp_print_scripts( 'wpinv-admin-script' );
-		wp_print_scripts( 'select2' );
-		?>
+        wp_register_style( 'font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(  ), WPINV_VERSION );
+        wp_enqueue_style( 'font-awesome' );
+        do_action( 'admin_print_styles' );
+        wp_print_styles( 'select2' );
+        wp_print_scripts( 'wpinv-admin-script' );
+        wp_print_scripts( 'select2' );
+        ?>
 		<?php do_action( 'admin_head' ); ?>
 		<style>
 			body,p{
@@ -146,22 +146,22 @@ 
 			}
 
 			<?php
-				$aui_settings = AyeCode_UI_Settings::instance();
-				echo $aui_settings::css_primary('#009874',true);
-			 ?>
+                $aui_settings = AyeCode_UI_Settings::instance();
+                echo $aui_settings::css_primary('#009874',true);
+                ?>
 
 
 		</style>
 	</head>
 	<body class="gp-setup wp-core-ui bg-lightx mx-auto text-dark scrollbars-ios" style="background: #f3f6ff;">
 	<?php
-	if(isset($_REQUEST['step'])){
-	$this->setup_wizard_steps();
-	}else{
-	echo "<div class='mb-3'>&nbsp;</div>";
-	}
+    if(isset($_REQUEST['step'])){
+    $this->setup_wizard_steps();
+    }else{
+    echo "<div class='mb-3'>&nbsp;</div>";
+    }
 
-	?>
+    ?>
 	<h1 class="h2 text-center pb-3">
 		<a class=" text-decoration-none" href="https://wpgetpaid.com/">
 			<span class="text-black-50">
@@ -170,61 +170,61 @@ 
 		</a>
 	</h1>
 	<?php
-	}
-
-	/**
-	 * Output the steps.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_wizard_steps() {
-		$ouput_steps = $this->steps;
-		array_shift( $ouput_steps );
-		?>
+    }
+
+    /**
+     * Output the steps.
+     *
+     * @since 2.0.0
+     */
+    public function setup_wizard_steps() {
+        $ouput_steps = $this->steps;
+        array_shift( $ouput_steps );
+        ?>
 		<ol class="gp-setup-steps mb-0 pb-4 mw-100 list-group list-group-horizontal text-center">
 			<?php
-			$current = '';
-			foreach ( $ouput_steps as $step_key => $step ) : ?>
+            $current = '';
+            foreach ( $ouput_steps as $step_key => $step ) : ?>
 				<li class="list-group-item flex-fill rounded-0 <?php
-				$maybe_hide = 'd-none';
-				if ( $step_key === $this->step ) {
-					$current = $this->step;
-					echo 'active';
-					$maybe_hide = '';
-				} elseif ( array_search( $this->step, array_keys( $this->steps ) ) > array_search( $step_key, array_keys( $this->steps ) ) ) {
-					echo 'done ';
-				}
-
-				echo ' '.$maybe_hide. ' d-md-block ';
-				$done = !$current ? 'text-success' : '';
-				?>"><i class="far fa-check-circle <?php echo $done ;?>"></i> <?php echo esc_html( $step['name'] ); ?></li>
+                $maybe_hide = 'd-none';
+                if ( $step_key === $this->step ) {
+                    $current = $this->step;
+                    echo 'active';
+                    $maybe_hide = '';
+                } elseif ( array_search( $this->step, array_keys( $this->steps ) ) > array_search( $step_key, array_keys( $this->steps ) ) ) {
+                    echo 'done ';
+                }
+
+                echo ' '.$maybe_hide. ' d-md-block ';
+                $done = !$current ? 'text-success' : '';
+                ?>"><i class="far fa-check-circle <?php echo $done ;?>"></i> <?php echo esc_html( $step['name'] ); ?></li>
 			<?php endforeach; ?>
 		</ol>
 		<?php
-	}
-
-	/**
-	 * Output the content for the current step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_wizard_content() {
-		echo '<div class="gp-setup-content rowx mw-100 text-center mb-3">';
-		echo '<div class="col-12 col-md-5 m-auto">';
-		echo '<div class="card shadow-sm">';
-		call_user_func( $this->steps[ $this->step ]['view'], $this );
-		echo '</div>';
-		echo '</div>';
-		echo '</div>';
-	}
-
-	/**
-	 * Setup Wizard Footer.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_wizard_footer() {
-	?>
+    }
+
+    /**
+     * Output the content for the current step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_wizard_content() {
+        echo '<div class="gp-setup-content rowx mw-100 text-center mb-3">';
+        echo '<div class="col-12 col-md-5 m-auto">';
+        echo '<div class="card shadow-sm">';
+        call_user_func( $this->steps[ $this->step ]['view'], $this );
+        echo '</div>';
+        echo '</div>';
+        echo '</div>';
+    }
+
+    /**
+     * Setup Wizard Footer.
+     *
+     * @since 2.0.0
+     */
+    public function setup_wizard_footer() {
+    ?>
 	<?php if ( 'next_steps' === $this->step ){ ?>
 		<p class="gd-return-to-dashboard-wrap"><a class="gd-return-to-dashboard btn btn-link d-block text-muted"
 		                                          href="<?php echo esc_url( admin_url() ); ?>"><?php esc_html_e( 'Return to the WordPress Dashboard', 'invoicing' ); ?></a>
@@ -238,13 +238,13 @@ 
 	<?php
 }
 
-	/**
-	 * Introduction step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_introduction() {
-		?>
+    /**
+     * Introduction step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_introduction() {
+        ?>
 		<h1 class="h4 card-header bg-white border-bottom-0 pt-4 pb-1"><?php esc_html_e( 'Welcome to GetPaid!', 'invoicing' ); ?></h1>
 		<div class="card-body text-muted ">
 			<p class=""><?php _e( 'Thank you for choosing GetPaid - The most Powerful Payments Plugin for WordPress', 'invoicing' ); ?></p>
@@ -350,50 +350,50 @@ 
 			   class="btn btn-link d-block mt-2 "><?php esc_html_e( 'Not right now', 'invoicing' ); ?></a>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Get the URL for the next step's screen.
-	 *
-	 * @param string step   slug (default: current step)
-	 *
-	 * @return string       URL for next step if a next step exists.
-	 *                      Admin URL if it's the last step.
-	 *                      Empty string on failure.
-	 * @since 3.0.0
-	 */
-	public function get_next_step_link( $step = '' ) {
-		if ( ! $step ) {
-			$step = $this->step;
-		}
-
-		$keys = array_keys( $this->steps );
-		if ( end( $keys ) === $step ) {
-			return admin_url();
-		}
-
-		$step_index = array_search( $step, $keys );
-		if ( false === $step_index ) {
-			return '';
-		}
-
-		return remove_query_arg('settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ));
-	}
-
-	/**
-	 * Setup maps api.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_business() {
-		?>
+    }
+
+    /**
+     * Get the URL for the next step's screen.
+     *
+     * @param string step   slug (default: current step)
+     *
+     * @return string       URL for next step if a next step exists.
+     *                      Admin URL if it's the last step.
+     *                      Empty string on failure.
+     * @since 3.0.0
+     */
+    public function get_next_step_link( $step = '' ) {
+        if ( ! $step ) {
+            $step = $this->step;
+        }
+
+        $keys = array_keys( $this->steps );
+        if ( end( $keys ) === $step ) {
+            return admin_url();
+        }
+
+        $step_index = array_search( $step, $keys );
+        if ( false === $step_index ) {
+            return '';
+        }
+
+        return remove_query_arg('settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ));
+    }
+
+    /**
+     * Setup maps api.
+     *
+     * @since 2.0.0
+     */
+    public function setup_business() {
+        ?>
 		<form method="post" class="text-left card-body" action="options.php">
 			<?php
 
-			settings_fields( 'wpinv_settings' );
+            settings_fields( 'wpinv_settings' );
 
-			// override http referer to make it send back to the next step
-				?>
+            // override http referer to make it send back to the next step
+                ?>
 			<input type="hidden" name="_wp_http_referer" value="<?php echo esc_url( $this->get_next_step_link() ); ?>">
 
 			<table class="gp-setup-maps w-100 " cellspacing="0">
@@ -402,21 +402,21 @@ 
 
 				<?php
 
-				global $wp_settings_fields;
+                global $wp_settings_fields;
 
-				$page = 'wpinv_settings_general_main';
-				$section = 'wpinv_settings_general_main';
-				if ( ! isset( $wp_settings_fields[ $page ][ $section ] ) ) {
-			        return;
-			    }
+                $page = 'wpinv_settings_general_main';
+                $section = 'wpinv_settings_general_main';
+                if ( ! isset( $wp_settings_fields[ $page ][ $section ] ) ) {
+                    return;
+                }
 
-			    $settings =  $wp_settings_fields[ $page ][ $section ];
+                $settings =  $wp_settings_fields[ $page ][ $section ];
 
-				// unset title
-				unset($settings["wpinv_settings[location_settings]"]);
+                // unset title
+                unset($settings["wpinv_settings[location_settings]"]);
 
-			    $this->output_fields($settings);
-				?>
+                $this->output_fields($settings);
+                ?>
 
 
 				</tbody>
@@ -429,64 +429,64 @@ 
 			</p>
 		</form>
 		<?php
-	}
+    }
 
-	public function output_fields($settings){
+    public function output_fields($settings){
 
-	    if ( empty($settings)) {
-	        return;
-	    }
+        if ( empty($settings)) {
+            return;
+        }
 
 //print_r($settings);
-	    foreach ( (array) $settings as $key => $field ) {
+        foreach ( (array) $settings as $key => $field ) {
 
 
-	        $class = '';
+            $class = '';
 
-	        if ( ! empty( $field['args']['class'] ) ) {
-	            $class = esc_attr( $field['args']['class'] );
-	        }
+            if ( ! empty( $field['args']['class'] ) ) {
+                $class = esc_attr( $field['args']['class'] );
+            }
 
-	       // echo '<div class="form-group '.$class.'">';
+            // echo '<div class="form-group '.$class.'">';
 
 
-	        if ( ! empty( $field['args']['label_for'] ) ) {
-	            $for = ' for="' . esc_attr( $field['args']['label_for'] ) . '" ';
-	        } else {
-	            $for = '';
-	        }
+            if ( ! empty( $field['args']['label_for'] ) ) {
+                $for = ' for="' . esc_attr( $field['args']['label_for'] ) . '" ';
+            } else {
+                $for = '';
+            }
 
-			$value  = isset( $field['args']['std'] ) ? $field['args']['std'] : '';
-			$value  = wpinv_get_option( $field['args']['id'], $value );
+            $value  = isset( $field['args']['std'] ) ? $field['args']['std'] : '';
+            $value  = wpinv_get_option( $field['args']['id'], $value );
 
-			if($field['callback'] == 'wpinv_text_callback' || $field['callback'] == 'wpinv_number_callback' ){
+            if($field['callback'] == 'wpinv_text_callback' || $field['callback'] == 'wpinv_number_callback' ){
 
 
-			// hide the logo inputs, we need to set them as hidden so they don't blank the current values.
-			$help_text = isset($field['args']['desc']) ? esc_attr($field['args']['desc']) : '';
-			$type = $field['callback'] == 'wpinv_number_callback'  ? 'number' : 'text';
-			$label = isset($field['args']['name']) ? esc_attr($field['args']['name']) : '';
+            // hide the logo inputs, we need to set them as hidden so they don't blank the current values.
+            $help_text = isset($field['args']['desc']) ? esc_attr($field['args']['desc']) : '';
+            $type = $field['callback'] == 'wpinv_number_callback'  ? 'number' : 'text';
+            $label = isset($field['args']['name']) ? esc_attr($field['args']['name']) : '';
 
-			if(in_array($field['id'],array('wpinv_settings[logo]','wpinv_settings[logo_width]','wpinv_settings[logo_height]'))){
-				$type = 'hidden';
-				$help_text = '';
-				$label = '';
-			}
+            if(in_array($field['id'],array('wpinv_settings[logo]','wpinv_settings[logo_width]','wpinv_settings[logo_height]'))){
+                $type = 'hidden';
+                $help_text = '';
+                $label = '';
+            }
 
-				echo aui()->input(array(
-									'type'  =>  $type,
-									'id'    =>  isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
-									'name'    =>  isset($field['id']) ? esc_attr($field['id']) : '',
-									'value' =>   is_scalar( $value ) ? esc_attr( $value ) : '',
-									'required'  => false,
-									'help_text' => $help_text,
-									'label' => $label,
-									'label_type'    => 'floating'
-								));
-			}elseif($field['callback'] == 'wpinv_select_callback' || $field['callback'] == 'wpinv_country_states_callback'){
+                echo aui()->input(array(
+                                    'type'  =>  $type,
+                                    'id'    =>  isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
+                                    'name'    =>  isset($field['id']) ? esc_attr($field['id']) : '',
+                                    'value' =>   is_scalar( $value ) ? esc_attr( $value ) : '',
+                                    'required'  => false,
+                                    'help_text' => $help_text,
+                                    'label' => $label,
+                                    'label_type'    => 'floating'
+                                ));
+            }elseif($field['callback'] == 'wpinv_select_callback' || $field['callback'] == 'wpinv_country_states_callback'){
 
 if($field['id']=='wpinv_settings[default_state]'){
-			$country_value  = wpinv_get_option( 'wpinv_settings[default_country]', 'US');
+            $country_value  = wpinv_get_option( 'wpinv_settings[default_country]', 'US');
 $options = wpinv_get_country_states($country_value);//echo $value .'###'.$country_value;
 $class = 'getpaid_js_field-state';
 }else{
@@ -496,79 +496,79 @@ 
 
 //print_r($options );echo '###';
 
-				echo aui()->select( array(
-					'id'              =>  isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
-					'name'            =>  isset($field['id']) ? esc_attr($field['id']) : '',
-					'placeholder'     => '',
+                echo aui()->select( array(
+                    'id'              =>  isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
+                    'name'            =>  isset($field['id']) ? esc_attr($field['id']) : '',
+                    'placeholder'     => '',
 //					'title'           => $site_title,
-					'value'           => is_scalar( $value ) ? esc_attr( $value ) : '',
-					'required'        => false,
-					'help_text'       => isset($field['args']['desc']) ? esc_attr($field['args']['desc']) : '',
-					'label'           => isset($field['args']['name']) ? esc_attr($field['args']['name']) : '',
-					'options'         => $options,
-					'select2'         => true,
-					'label_type'    => 'floating',
-					'class'           => $class,
+                    'value'           => is_scalar( $value ) ? esc_attr( $value ) : '',
+                    'required'        => false,
+                    'help_text'       => isset($field['args']['desc']) ? esc_attr($field['args']['desc']) : '',
+                    'label'           => isset($field['args']['name']) ? esc_attr($field['args']['name']) : '',
+                    'options'         => $options,
+                    'select2'         => true,
+                    'label_type'    => 'floating',
+                    'class'           => $class,
 //					'wrap_class'      => isset( $field->css_class ) ? $field->css_class : '',
-				) );
-			}elseif($field['callback'] == 'wpinv_textarea_callback'){
-				$textarea =  aui()->textarea( array(
-					'id'              => isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
-					'name'            => isset($field['id']) ? esc_attr($field['id']) : '',
-					'placeholder'     => '',
+                ) );
+            }elseif($field['callback'] == 'wpinv_textarea_callback'){
+                $textarea =  aui()->textarea( array(
+                    'id'              => isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
+                    'name'            => isset($field['id']) ? esc_attr($field['id']) : '',
+                    'placeholder'     => '',
 //					'title'           => $site_title,
-					'value'           => is_scalar( $value ) ? esc_attr( $value ) : '',
-					'required'        => false,
-					'help_text'       => isset($field['args']['desc']) ? esc_attr($field['args']['desc']) : '',
-					'label'           => isset($field['args']['name']) ? esc_attr($field['args']['name']) : '',
-					'rows'            => '4',
-					'label_type'    => 'floating'
+                    'value'           => is_scalar( $value ) ? esc_attr( $value ) : '',
+                    'required'        => false,
+                    'help_text'       => isset($field['args']['desc']) ? esc_attr($field['args']['desc']) : '',
+                    'label'           => isset($field['args']['name']) ? esc_attr($field['args']['name']) : '',
+                    'rows'            => '4',
+                    'label_type'    => 'floating'
 //					'wrap_class'      => isset( $field->css_class ) ? $field->css_class : '',
-				) );
+                ) );
 
-				// bug fixed in AUI 0.1.51 for name stripping []
-				$textarea = str_replace(sanitize_html_class($field['args']['id']),esc_attr($field['args']['id']),$textarea );
+                // bug fixed in AUI 0.1.51 for name stripping []
+                $textarea = str_replace(sanitize_html_class($field['args']['id']),esc_attr($field['args']['id']),$textarea );
 
-				echo $textarea;
-			}
+                echo $textarea;
+            }
 
-			//echo "<div>";
+            //echo "<div>";
 
-	    }
-	}
+        }
+    }
 
-	/**
-	 * Save Maps Settings.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_business_save() {
+    /**
+     * Save Maps Settings.
+     *
+     * @since 2.0.0
+     */
+    public function setup_business_save() {
 
-	// nothing required here as options.php will send to next step
-		//check_admin_referer( 'gp-setup' );
+    // nothing required here as options.php will send to next step
+        //check_admin_referer( 'gp-setup' );
 
 //print_r($_POST);exit;
 //		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
 //		exit;
-	}
+    }
 
-	/**
-	 * Default Location settings.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_currency() {
+    /**
+     * Default Location settings.
+     *
+     * @since 2.0.0
+     */
+    public function setup_currency() {
 
-		?>
+        ?>
 
 		<form method="post" class="text-left card-body" action="options.php">
 			<?php
 
 
-			settings_fields( 'wpinv_settings' );
+            settings_fields( 'wpinv_settings' );
 
-			// override http referer to make it send back to the next step
-				?>
+            // override http referer to make it send back to the next step
+                ?>
 			<input type="hidden" name="_wp_http_referer" value="<?php echo esc_url( $this->get_next_step_link() ); ?>">
 
 			<table class="gp-setup-maps w-100 " cellspacing="0">
@@ -577,20 +577,20 @@ 
 
 				<?php
 
-				global $wp_settings_fields;
+                global $wp_settings_fields;
 
-				$page = 'wpinv_settings_general_currency_section';
-				$section = 'wpinv_settings_general_currency_section';
-				if ( ! isset( $wp_settings_fields[ $page ][ $section ] ) ) {
-			        return;
-			    }
+                $page = 'wpinv_settings_general_currency_section';
+                $section = 'wpinv_settings_general_currency_section';
+                if ( ! isset( $wp_settings_fields[ $page ][ $section ] ) ) {
+                    return;
+                }
 
-			    $settings =  $wp_settings_fields[ $page ][ $section ];
+                $settings =  $wp_settings_fields[ $page ][ $section ];
 
 //				print_r($settings);exit;
 
-			    $this->output_fields($settings);
-				?>
+                $this->output_fields($settings);
+                ?>
 
 
 				</tbody>
@@ -604,35 +604,35 @@ 
 		</form>
 
 		<?php
-	}
+    }
 
 
-	/**
-	 * Save Default Location Settings.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_currency_save() {
-		check_admin_referer( 'gp-setup' );
+    /**
+     * Save Default Location Settings.
+     *
+     * @since 2.0.0
+     */
+    public function setup_currency_save() {
+        check_admin_referer( 'gp-setup' );
 
-		$generalSettings = new GeoDir_Settings_General();
-		$settings        = $generalSettings->get_settings( 'location' );
-		GeoDir_Admin_Settings::save_fields( $settings );
+        $generalSettings = new GeoDir_Settings_General();
+        $settings        = $generalSettings->get_settings( 'location' );
+        GeoDir_Admin_Settings::save_fields( $settings );
 
-		do_action( 'geodir_setup_wizard_default_location_saved', $settings );
+        do_action( 'geodir_setup_wizard_default_location_saved', $settings );
 
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
-		exit;
-	}
+        wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+        exit;
+    }
 
-	/**
-	 * Dummy Data setup.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_recommend() {
+    /**
+     * Dummy Data setup.
+     *
+     * @since 2.0.0
+     */
+    public function setup_recommend() {
 
-		?>
+        ?>
 		<form method="post" class="text-center card-body">
 			<div class="gd-wizard-recommend">
 
@@ -643,22 +643,22 @@ 
 
 				<?php
 
-				include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+                include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
 
-				$recommend_wp_plugins = self::get_recommend_wp_plugins();
+                $recommend_wp_plugins = self::get_recommend_wp_plugins();
 
-				//			$status = install_plugin_install_status( array("slug"=>"two-factor","version"=>""));
-				//			print_r($status);
+                //			$status = install_plugin_install_status( array("slug"=>"two-factor","version"=>""));
+                //			print_r($status);
 
-				if ( ! empty( $recommend_wp_plugins ) ) {
+                if ( ! empty( $recommend_wp_plugins ) ) {
 
-				?>
+                ?>
 				<ul class="list-group">
 					<?php
-						foreach ( $recommend_wp_plugins as $plugin ) {
-						$status = install_plugin_install_status( array( "slug" => $plugin['slug'], "version" => "" ) );
-						$plugin_status = isset( $status['status'] ) ? $status['status'] : '';
-						?>
+                        foreach ( $recommend_wp_plugins as $plugin ) {
+                        $status = install_plugin_install_status( array( "slug" => $plugin['slug'], "version" => "" ) );
+                        $plugin_status = isset( $status['status'] ) ? $status['status'] : '';
+                        ?>
 							<li class="list-group-item d-flex justify-content-between align-items-center flex-wrap text-left">
 							    <span class="mr-auto"><?php echo esc_attr($plugin['name']); ?></span>
 								<div class="spinner-border spinner-border-sm mr-2 d-none text-muted" role="status">
@@ -671,16 +671,16 @@ 
 								<small class="w-100"><?php echo esc_attr($plugin['desc'] );?></small>
 							 </li>
 						<?php
-						}
+                        }
                     ?>
 				</ul>
 				<?php
 
-				}
+                }
 
 
 
-				?>
+                ?>
 
 
 
@@ -691,57 +691,57 @@ 
 			</p>
 		</form>
 		<?php
-	}
-
-		/**
-	 * A list of recommended wp.org plugins.
-	 * @return array
-	 */
-	public static function get_recommend_wp_plugins(){
-		$plugins = array(
-			'ayecode-connect' => array(
-				'url'   => 'https://wordpress.org/plugins/ayecode-connect/',
-				'slug'   => 'ayecode-connect',
-				'name'   => 'AyeCode Connect',
-				'desc'   => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
-			),
-			'ninja-forms' => array(
-				'url'   => 'https://wordpress.org/plugins/invoicing-quotes/',
-				'slug'   => 'invoicing-quotes',
-				'name'   => 'Customer Quotes',
-				'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.','geodirectory'),
-			),
-			'userswp' => array(
-				'url'   => 'https://wordpress.org/plugins/userswp/',
-				'slug'   => 'userswp',
-				'name'   => 'UsersWP',
-				'desc'   => __('Frontend user login and registration as well as slick profile pages.','geodirectory'),
-			),
-		);
-
-		return $plugins;
-	}
-
-	/**
-	 * Dummy data save.
-	 *
-	 * This is done via ajax so we just pass onto the next step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_recommend_save() {
-		check_admin_referer( 'gp-setup' );
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
-		exit;
-	}
-
-	/**
-	 * Dummy Data setup.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_payments() {
-		?>
+    }
+
+        /**
+         * A list of recommended wp.org plugins.
+         * @return array
+         */
+    public static function get_recommend_wp_plugins(){
+        $plugins = array(
+            'ayecode-connect' => array(
+                'url'   => 'https://wordpress.org/plugins/ayecode-connect/',
+                'slug'   => 'ayecode-connect',
+                'name'   => 'AyeCode Connect',
+                'desc'   => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
+            ),
+            'ninja-forms' => array(
+                'url'   => 'https://wordpress.org/plugins/invoicing-quotes/',
+                'slug'   => 'invoicing-quotes',
+                'name'   => 'Customer Quotes',
+                'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.','geodirectory'),
+            ),
+            'userswp' => array(
+                'url'   => 'https://wordpress.org/plugins/userswp/',
+                'slug'   => 'userswp',
+                'name'   => 'UsersWP',
+                'desc'   => __('Frontend user login and registration as well as slick profile pages.','geodirectory'),
+            ),
+        );
+
+        return $plugins;
+    }
+
+    /**
+     * Dummy data save.
+     *
+     * This is done via ajax so we just pass onto the next step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_recommend_save() {
+        check_admin_referer( 'gp-setup' );
+        wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+        exit;
+    }
+
+    /**
+     * Dummy Data setup.
+     *
+     * @since 2.0.0
+     */
+    public function setup_payments() {
+        ?>
 		<form method="post" class="text-center card-body">
 			<div class="gp-wizard-payments">
 
@@ -782,7 +782,7 @@ 
 
 
 
-				?>
+                ?>
 
 
 			</div>
@@ -792,29 +792,29 @@ 
 			</p>
 		</form>
 		<?php
-	}
-
-	/**
-	 * Dummy data save.
-	 *
-	 * This is done via ajax so we just pass onto the next step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_payments_save() {
-		check_admin_referer( 'gp-setup' );
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
-		exit;
-	}
-
-	/**
-	 * Final step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_ready() {
-		$this->setup_ready_actions();
-		?>
+    }
+
+    /**
+     * Dummy data save.
+     *
+     * This is done via ajax so we just pass onto the next step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_payments_save() {
+        check_admin_referer( 'gp-setup' );
+        wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+        exit;
+    }
+
+    /**
+     * Final step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_ready() {
+        $this->setup_ready_actions();
+        ?>
 
 		<div class="text-center card-body">
 			<h1 class="h3"><?php esc_html_e( 'Awesome, you are ready to GetPaid', 'invoicing' ); ?></h1>
@@ -855,24 +855,24 @@ 
 			</div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Actions on the final step.
-	 *
-	 * @since 2.0.0
-	 */
-	private function setup_ready_actions() {
-		GeoDir_Admin_Notices::remove_notice( 'install' );
-
-		if ( isset( $_GET['gd_tracker_optin'] ) && isset( $_GET['gd_tracker_nonce'] ) && wp_verify_nonce( $_GET['gd_tracker_nonce'], 'gd_tracker_optin' ) ) {
-			geodir_update_option( 'usage_tracking', true );
-			GeoDir_Admin_Tracker::send_tracking_data( true );
-
-		} elseif ( isset( $_GET['gd_tracker_optout'] ) && isset( $_GET['gd_tracker_nonce'] ) && wp_verify_nonce( $_GET['gd_tracker_nonce'], 'gd_tracker_optout' ) ) {
-			geodir_update_option( 'usage_tracking', false );
-		}
-	}
+    }
+
+    /**
+     * Actions on the final step.
+     *
+     * @since 2.0.0
+     */
+    private function setup_ready_actions() {
+        GeoDir_Admin_Notices::remove_notice( 'install' );
+
+        if ( isset( $_GET['gd_tracker_optin'] ) && isset( $_GET['gd_tracker_nonce'] ) && wp_verify_nonce( $_GET['gd_tracker_nonce'], 'gd_tracker_optin' ) ) {
+            geodir_update_option( 'usage_tracking', true );
+            GeoDir_Admin_Tracker::send_tracking_data( true );
+
+        } elseif ( isset( $_GET['gd_tracker_optout'] ) && isset( $_GET['gd_tracker_nonce'] ) && wp_verify_nonce( $_GET['gd_tracker_nonce'], 'gd_tracker_optout' ) ) {
+            geodir_update_option( 'usage_tracking', false );
+        }
+    }
 
 
 }

Spacing +170 added lines, -170 removed lines

@@ -10,7 +10,7 @@ 
  * @version     2.4.0
  * @info        GetPaid Setup Wizard.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,14 +29,14 @@ 
 	 * Hook in tabs.
 	 */
 	public function __construct() {
-		if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && current_user_can( 'manage_options' ) ) {
-			add_action( 'admin_menu', array( $this, 'admin_menus' ) );
-			add_action( 'current_screen', array( $this, 'setup_wizard' ) );
+		if (apply_filters('getpaid_enable_setup_wizard', true) && current_user_can('manage_options')) {
+			add_action('admin_menu', array($this, 'admin_menus'));
+			add_action('current_screen', array($this, 'setup_wizard'));
 
 			// add default content action
-			add_action( 'geodir_wizard_content_dummy_data', array( __CLASS__, 'content_dummy_data' ) );
-			add_action( 'geodir_wizard_content_sidebars', array( __CLASS__, 'content_sidebars' ) );
-			add_action( 'geodir_wizard_content_menus', array( __CLASS__, 'content_menus' ) );
+			add_action('geodir_wizard_content_dummy_data', array(__CLASS__, 'content_dummy_data'));
+			add_action('geodir_wizard_content_sidebars', array(__CLASS__, 'content_sidebars'));
+			add_action('geodir_wizard_content_menus', array(__CLASS__, 'content_menus'));
 		}
 	}
 
@@ -44,7 +44,7 @@ 
 	 * Add admin menus/screens.
 	 */
 	public function admin_menus() {
-		add_dashboard_page( '', '', 'manage_options', 'gp-setup', '' );
+		add_dashboard_page('', '', 'manage_options', 'gp-setup', '');
 	}
 
 	/**
@@ -53,44 +53,44 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_wizard() {
-		if ( empty( $_GET['page'] ) || 'gp-setup' !== $_GET['page'] ) {
+		if (empty($_GET['page']) || 'gp-setup' !== $_GET['page']) {
 			return;
 		}
 		$default_steps = array(
 			'introduction'     => array(
-				'name'    => __( 'Introduction', 'invoicing' ),
-				'view'    => array( $this, 'setup_introduction' ),
+				'name'    => __('Introduction', 'invoicing'),
+				'view'    => array($this, 'setup_introduction'),
 				'handler' => '',
 			),
 			'business_details'             => array(
-				'name'    => __( "Business Details", 'invoicing' ),
-				'view'    => array( $this, 'setup_business' ),
-				'handler' => array( $this, 'setup_business_save' ),
+				'name'    => __("Business Details", 'invoicing'),
+				'view'    => array($this, 'setup_business'),
+				'handler' => array($this, 'setup_business_save'),
 			),
 			'currency' => array(
-				'name'    => __( 'Currency', 'invoicing' ),
-				'view'    => array( $this, 'setup_currency' ),
-				'handler' => array( $this, 'setup_currency_save' ),
+				'name'    => __('Currency', 'invoicing'),
+				'view'    => array($this, 'setup_currency'),
+				'handler' => array($this, 'setup_currency_save'),
 			),
 			'payments'        => array(
-				'name'    => __( 'Payment Gateways', 'invoicing' ),
-				'view'    => array( $this, 'setup_payments' ),
-				'handler' => array( $this, 'setup_payments_save' ),
+				'name'    => __('Payment Gateways', 'invoicing'),
+				'view'    => array($this, 'setup_payments'),
+				'handler' => array($this, 'setup_payments_save'),
 			),
 			'recommend'          => array(
-				'name'    => __( 'Recommend', 'invoicing' ),
-				'view'    => array( $this, 'setup_recommend' ),
-				'handler' => array( $this, 'setup_recommend_save' ),
+				'name'    => __('Recommend', 'invoicing'),
+				'view'    => array($this, 'setup_recommend'),
+				'handler' => array($this, 'setup_recommend_save'),
 			),
 			'next_steps'       => array(
-				'name'    => __( 'Get Paid', 'invoicing' ),
-				'view'    => array( $this, 'setup_ready' ),
+				'name'    => __('Get Paid', 'invoicing'),
+				'view'    => array($this, 'setup_ready'),
 				'handler' => '',
 			),
 		);
 
-		$this->steps     = apply_filters( 'getpaid_setup_wizard_steps', $default_steps );
-		$this->step      = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : current( array_keys( $this->steps ) );
+		$this->steps     = apply_filters('getpaid_setup_wizard_steps', $default_steps);
+		$this->step      = isset($_GET['step']) ? sanitize_key($_GET['step']) : current(array_keys($this->steps));
 
 
 		// enqueue the script
@@ -128,17 +128,17 @@ 
 	<head>
 		<meta name="viewport" content="width=device-width"/>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title><?php esc_html_e( 'GetPaid &rsaquo; Setup Wizard', 'invoicing' ); ?></title>
+		<title><?php esc_html_e('GetPaid &rsaquo; Setup Wizard', 'invoicing'); ?></title>
 		<?php
 
-		wp_register_style( 'font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(  ), WPINV_VERSION );
-		wp_enqueue_style( 'font-awesome' );
-		do_action( 'admin_print_styles' );
-		wp_print_styles( 'select2' );
-		wp_print_scripts( 'wpinv-admin-script' );
-		wp_print_scripts( 'select2' );
+		wp_register_style('font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(  ), WPINV_VERSION);
+		wp_enqueue_style('font-awesome');
+		do_action('admin_print_styles');
+		wp_print_styles('select2');
+		wp_print_scripts('wpinv-admin-script');
+		wp_print_scripts('select2');
 		?>
-		<?php do_action( 'admin_head' ); ?>
+		<?php do_action('admin_head'); ?>
 		<style>
 			body,p{
 				font-size: 16px;
@@ -147,7 +147,7 @@ 
 
 			<?php
 				$aui_settings = AyeCode_UI_Settings::instance();
-				echo $aui_settings::css_primary('#009874',true);
+				echo $aui_settings::css_primary('#009874', true);
 			 ?>
 
 
@@ -155,9 +155,9 @@ 
 	</head>
 	<body class="gp-setup wp-core-ui bg-lightx mx-auto text-dark scrollbars-ios" style="background: #f3f6ff;">
 	<?php
-	if(isset($_REQUEST['step'])){
+	if (isset($_REQUEST['step'])) {
 	$this->setup_wizard_steps();
-	}else{
+	} else {
 	echo "<div class='mb-3'>&nbsp;</div>";
 	}
 
@@ -165,7 +165,7 @@ 
 	<h1 class="h2 text-center pb-3">
 		<a class=" text-decoration-none" href="https://wpgetpaid.com/">
 			<span class="text-black-50">
-				<img class="ml-n3x" src="<?php echo WPINV_PLUGIN_URL . 'assets/images/getpaid-logo.png';?>" />
+				<img class="ml-n3x" src="<?php echo WPINV_PLUGIN_URL . 'assets/images/getpaid-logo.png'; ?>" />
 			</span>
 		</a>
 	</h1>
@@ -179,25 +179,25 @@ 
 	 */
 	public function setup_wizard_steps() {
 		$ouput_steps = $this->steps;
-		array_shift( $ouput_steps );
+		array_shift($ouput_steps);
 		?>
 		<ol class="gp-setup-steps mb-0 pb-4 mw-100 list-group list-group-horizontal text-center">
 			<?php
 			$current = '';
-			foreach ( $ouput_steps as $step_key => $step ) : ?>
+			foreach ($ouput_steps as $step_key => $step) : ?>
 				<li class="list-group-item flex-fill rounded-0 <?php
 				$maybe_hide = 'd-none';
-				if ( $step_key === $this->step ) {
+				if ($step_key === $this->step) {
 					$current = $this->step;
 					echo 'active';
 					$maybe_hide = '';
-				} elseif ( array_search( $this->step, array_keys( $this->steps ) ) > array_search( $step_key, array_keys( $this->steps ) ) ) {
+				} elseif (array_search($this->step, array_keys($this->steps)) > array_search($step_key, array_keys($this->steps))) {
 					echo 'done ';
 				}
 
-				echo ' '.$maybe_hide. ' d-md-block ';
+				echo ' ' . $maybe_hide . ' d-md-block ';
 				$done = !$current ? 'text-success' : '';
-				?>"><i class="far fa-check-circle <?php echo $done ;?>"></i> <?php echo esc_html( $step['name'] ); ?></li>
+				?>"><i class="far fa-check-circle <?php echo $done; ?>"></i> <?php echo esc_html($step['name']); ?></li>
 			<?php endforeach; ?>
 		</ol>
 		<?php
@@ -212,7 +212,7 @@ 
 		echo '<div class="gp-setup-content rowx mw-100 text-center mb-3">';
 		echo '<div class="col-12 col-md-5 m-auto">';
 		echo '<div class="card shadow-sm">';
-		call_user_func( $this->steps[ $this->step ]['view'], $this );
+		call_user_func($this->steps[$this->step]['view'], $this);
 		echo '</div>';
 		echo '</div>';
 		echo '</div>';
@@ -225,13 +225,13 @@ 
 	 */
 	public function setup_wizard_footer() {
 	?>
-	<?php if ( 'next_steps' === $this->step ){ ?>
+	<?php if ('next_steps' === $this->step) { ?>
 		<p class="gd-return-to-dashboard-wrap"><a class="gd-return-to-dashboard btn btn-link d-block text-muted"
-		                                          href="<?php echo esc_url( admin_url() ); ?>"><?php esc_html_e( 'Return to the WordPress Dashboard', 'invoicing' ); ?></a>
+		                                          href="<?php echo esc_url(admin_url()); ?>"><?php esc_html_e('Return to the WordPress Dashboard', 'invoicing'); ?></a>
 		</p>
-	<?php }else{ ?>
-	<p class="gd-return-to-dashboard-wrap"><a href="<?php echo esc_url( $this->get_next_step_link() ); ?>"
-		                class="btn btn-link d-block text-muted"><?php esc_html_e( 'Skip this step', 'invoicing' ); ?></a></p>
+	<?php } else { ?>
+	<p class="gd-return-to-dashboard-wrap"><a href="<?php echo esc_url($this->get_next_step_link()); ?>"
+		                class="btn btn-link d-block text-muted"><?php esc_html_e('Skip this step', 'invoicing'); ?></a></p>
 	<?php } ?>
 	</body>
 	</html>
@@ -245,61 +245,61 @@ 
 	 */
 	public function setup_introduction() {
 		?>
-		<h1 class="h4 card-header bg-white border-bottom-0 pt-4 pb-1"><?php esc_html_e( 'Welcome to GetPaid!', 'invoicing' ); ?></h1>
+		<h1 class="h4 card-header bg-white border-bottom-0 pt-4 pb-1"><?php esc_html_e('Welcome to GetPaid!', 'invoicing'); ?></h1>
 		<div class="card-body text-muted ">
-			<p class=""><?php _e( 'Thank you for choosing GetPaid - The most Powerful Payments Plugin for WordPress', 'invoicing' ); ?></p>
+			<p class=""><?php _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 _e( '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 _e('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( $this->get_next_step_link() ); ?>"
-			   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>
+			<a href="<?php echo esc_url($this->get_next_step_link()); ?>"
+			   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>
 		</div>
 
 
 		</div>
 		<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( 'GetPaid Features & Addons!', 'invoicing' ); ?></h1>
+		<h1 class="h4 card-header bg-white border-bottom-0  pt-4 pb-1"><?php esc_html_e('GetPaid Features & Addons!', 'invoicing'); ?></h1>
 		<div class="card-body text-muted overflow-hidden">
-			<p class=""><?php _e( 'Collect one time & recurring payments online within minutes. No complex setup required.', 'invoicing' ); ?></p>
+			<p class=""><?php _e('Collect one time & recurring payments online within minutes. No complex setup required.', 'invoicing'); ?></p>
 			<hr class="">
 
 			<div class="row row row-cols-2 text-left">
 				<div class="col mt-3">
 					<div class="media">
-					  <img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/buy.svg';?>" class="mr-3" alt="...">
+					  <img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/buy.svg'; ?>" class="mr-3" alt="...">
 					  <div class="media-body">
-					    <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Buy Now Buttons','invoicing');?></h6>
-					    <small><?php _e('Sell via buy now buttons anywhere on your site','invoicing');?></small>
+					    <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Buy Now Buttons', 'invoicing'); ?></h6>
+					    <small><?php _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 WPINV_PLUGIN_URL . 'assets/images/report.svg';?>" class="mr-3" alt="...">
+					  <img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/report.svg'; ?>" class="mr-3" alt="...">
 					  <div class="media-body">
-					    <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via payment form','invoicing');?></h6>
-					    <small><?php _e('Payment forms are conversion-optimized checkout forms','invoicing');?></small>
+					    <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via payment form', 'invoicing'); ?></h6>
+					    <small><?php _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 WPINV_PLUGIN_URL . 'assets/images/invoices.svg';?>" class="mr-3" alt="...">
+					  <img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/invoices.svg'; ?>" class="mr-3" alt="...">
 					  <div class="media-body">
-					    <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Invoice','invoicing');?></h6>
-					    <small><?php _e('Create and send invoices for just about anything from the WOrdPress dashboard','invoicing');?></small>
+					    <h6 class="mt-0 font-weight-bold"><?php _e('GetPaid via Invoice', 'invoicing'); ?></h6>
+					    <small><?php _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 WPINV_PLUGIN_URL . 'assets/images/payment.svg';?>" class="mr-3" alt="...">
+					  <img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/payment.svg'; ?>" class="mr-3" alt="...">
 					  <div class="media-body">
-					    <h6 class="mt-0 font-weight-bold"><?php _e('Affordable payment gateways','invoicing');?></h6>
-					    <small><?php _e('On average our gateways are over 66% cheaper than our competition','invoicing');?></small>
+					    <h6 class="mt-0 font-weight-bold"><?php _e('Affordable payment gateways', 'invoicing'); ?></h6>
+					    <small><?php _e('On average our gateways are over 66% cheaper than our competition', 'invoicing'); ?></small>
 					  </div>
 					</div>
 				</div>
@@ -307,10 +307,10 @@ 
 
 			<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 _e('More with Membership!','invoicing');?></h4>
+				<h4 class="mt-0 font-weight-bold text-dark mb-4"><?php _e('More with Membership!', 'invoicing'); ?></h4>
 				<div class="row row-cols-2 text-left px-5">
 					<div class="col">
 						<ul class="list-unstyled">
@@ -329,12 +329,12 @@ 
 					</div>
 				</div>
 
-				<h5 class="mt-4 font-weight-bold text-dark mb-3"><?php _e('Membership Starts From','invoicing');?></h5>
+				<h5 class="mt-4 font-weight-bold text-dark mb-3"><?php _e('Membership Starts From', 'invoicing'); ?></h5>
 				<h1 class="mt-0 font-weight-bold text-dark mb-4 display-3">$49</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>
 
 
@@ -342,12 +342,12 @@ 
 
 		</div>
 		<div class="card-footer mb-0 bg-white gp-setup-actions step border-top-0">
-			<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>"
-			   class="btn btn-outline-primary button-next"><?php esc_html_e( 'Launch the Setup Wizard!', 'invoicing' ); ?></a>
+			<a href="<?php echo esc_url($this->get_next_step_link()); ?>"
+			   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>
-			<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>
+			   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>
 		</div>
 		<?php
 	}
@@ -362,22 +362,22 @@ 
 	 *                      Empty string on failure.
 	 * @since 3.0.0
 	 */
-	public function get_next_step_link( $step = '' ) {
-		if ( ! $step ) {
+	public function get_next_step_link($step = '') {
+		if (!$step) {
 			$step = $this->step;
 		}
 
-		$keys = array_keys( $this->steps );
-		if ( end( $keys ) === $step ) {
+		$keys = array_keys($this->steps);
+		if (end($keys) === $step) {
 			return admin_url();
 		}
 
-		$step_index = array_search( $step, $keys );
-		if ( false === $step_index ) {
+		$step_index = array_search($step, $keys);
+		if (false === $step_index) {
 			return '';
 		}
 
-		return remove_query_arg('settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ));
+		return remove_query_arg('settings-updated', add_query_arg('step', $keys[$step_index + 1]));
 	}
 
 	/**
@@ -390,11 +390,11 @@ 
 		<form method="post" class="text-left card-body" action="options.php">
 			<?php
 
-			settings_fields( 'wpinv_settings' );
+			settings_fields('wpinv_settings');
 
 			// override http referer to make it send back to the next step
 				?>
-			<input type="hidden" name="_wp_http_referer" value="<?php echo esc_url( $this->get_next_step_link() ); ?>">
+			<input type="hidden" name="_wp_http_referer" value="<?php echo esc_url($this->get_next_step_link()); ?>">
 
 			<table class="gp-setup-maps w-100 " cellspacing="0">
 
@@ -406,11 +406,11 @@ 
 
 				$page = 'wpinv_settings_general_main';
 				$section = 'wpinv_settings_general_main';
-				if ( ! isset( $wp_settings_fields[ $page ][ $section ] ) ) {
+				if (!isset($wp_settings_fields[$page][$section])) {
 			        return;
 			    }
 
-			    $settings =  $wp_settings_fields[ $page ][ $section ];
+			    $settings = $wp_settings_fields[$page][$section];
 
 				// unset title
 				unset($settings["wpinv_settings[location_settings]"]);
@@ -425,49 +425,49 @@ 
 
 			<p class="gp-setup-actions step text-center mt-4">
 				<input type="submit" class="btn btn-primary button-next"
-				       value="<?php esc_attr_e( 'Continue', 'invoicing' ); ?>" name="save_step"/>
+				       value="<?php esc_attr_e('Continue', 'invoicing'); ?>" name="save_step"/>
 			</p>
 		</form>
 		<?php
 	}
 
-	public function output_fields($settings){
+	public function output_fields($settings) {
 
-	    if ( empty($settings)) {
+	    if (empty($settings)) {
 	        return;
 	    }
 
 //print_r($settings);
-	    foreach ( (array) $settings as $key => $field ) {
+	    foreach ((array) $settings as $key => $field) {
 
 
 	        $class = '';
 
-	        if ( ! empty( $field['args']['class'] ) ) {
-	            $class = esc_attr( $field['args']['class'] );
+	        if (!empty($field['args']['class'])) {
+	            $class = esc_attr($field['args']['class']);
 	        }
 
 	       // echo '<div class="form-group '.$class.'">';
 
 
-	        if ( ! empty( $field['args']['label_for'] ) ) {
-	            $for = ' for="' . esc_attr( $field['args']['label_for'] ) . '" ';
+	        if (!empty($field['args']['label_for'])) {
+	            $for = ' for="' . esc_attr($field['args']['label_for']) . '" ';
 	        } else {
 	            $for = '';
 	        }
 
-			$value  = isset( $field['args']['std'] ) ? $field['args']['std'] : '';
-			$value  = wpinv_get_option( $field['args']['id'], $value );
+			$value  = isset($field['args']['std']) ? $field['args']['std'] : '';
+			$value  = wpinv_get_option($field['args']['id'], $value);
 
-			if($field['callback'] == 'wpinv_text_callback' || $field['callback'] == 'wpinv_number_callback' ){
+			if ($field['callback'] == 'wpinv_text_callback' || $field['callback'] == 'wpinv_number_callback') {
 
 
 			// hide the logo inputs, we need to set them as hidden so they don't blank the current values.
 			$help_text = isset($field['args']['desc']) ? esc_attr($field['args']['desc']) : '';
-			$type = $field['callback'] == 'wpinv_number_callback'  ? 'number' : 'text';
+			$type = $field['callback'] == 'wpinv_number_callback' ? 'number' : 'text';
 			$label = isset($field['args']['name']) ? esc_attr($field['args']['name']) : '';
 
-			if(in_array($field['id'],array('wpinv_settings[logo]','wpinv_settings[logo_width]','wpinv_settings[logo_height]'))){
+			if (in_array($field['id'], array('wpinv_settings[logo]', 'wpinv_settings[logo_width]', 'wpinv_settings[logo_height]'))) {
 				$type = 'hidden';
 				$help_text = '';
 				$label = '';
@@ -477,31 +477,31 @@ 
 									'type'  =>  $type,
 									'id'    =>  isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
 									'name'    =>  isset($field['id']) ? esc_attr($field['id']) : '',
-									'value' =>   is_scalar( $value ) ? esc_attr( $value ) : '',
+									'value' =>   is_scalar($value) ? esc_attr($value) : '',
 									'required'  => false,
 									'help_text' => $help_text,
 									'label' => $label,
 									'label_type'    => 'floating'
 								));
-			}elseif($field['callback'] == 'wpinv_select_callback' || $field['callback'] == 'wpinv_country_states_callback'){
+			}elseif ($field['callback'] == 'wpinv_select_callback' || $field['callback'] == 'wpinv_country_states_callback') {
 
-if($field['id']=='wpinv_settings[default_state]'){
-			$country_value  = wpinv_get_option( 'wpinv_settings[default_country]', 'US');
-$options = wpinv_get_country_states($country_value);//echo $value .'###'.$country_value;
+if ($field['id'] == 'wpinv_settings[default_state]') {
+			$country_value = wpinv_get_option('wpinv_settings[default_country]', 'US');
+$options = wpinv_get_country_states($country_value); //echo $value .'###'.$country_value;
 $class = 'getpaid_js_field-state';
-}else{
+} else {
 $options = isset($field['args']['options']) ? $field['args']['options'] : array();
 $class = 'getpaid_js_field-country';
 }
 
 //print_r($options );echo '###';
 
-				echo aui()->select( array(
+				echo aui()->select(array(
 					'id'              =>  isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
 					'name'            =>  isset($field['id']) ? esc_attr($field['id']) : '',
 					'placeholder'     => '',
 //					'title'           => $site_title,
-					'value'           => is_scalar( $value ) ? esc_attr( $value ) : '',
+					'value'           => is_scalar($value) ? esc_attr($value) : '',
 					'required'        => false,
 					'help_text'       => isset($field['args']['desc']) ? esc_attr($field['args']['desc']) : '',
 					'label'           => isset($field['args']['name']) ? esc_attr($field['args']['name']) : '',
@@ -510,24 +510,24 @@ 
 					'label_type'    => 'floating',
 					'class'           => $class,
 //					'wrap_class'      => isset( $field->css_class ) ? $field->css_class : '',
-				) );
-			}elseif($field['callback'] == 'wpinv_textarea_callback'){
-				$textarea =  aui()->textarea( array(
+				));
+			}elseif ($field['callback'] == 'wpinv_textarea_callback') {
+				$textarea = aui()->textarea(array(
 					'id'              => isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
 					'name'            => isset($field['id']) ? esc_attr($field['id']) : '',
 					'placeholder'     => '',
 //					'title'           => $site_title,
-					'value'           => is_scalar( $value ) ? esc_attr( $value ) : '',
+					'value'           => is_scalar($value) ? esc_attr($value) : '',
 					'required'        => false,
 					'help_text'       => isset($field['args']['desc']) ? esc_attr($field['args']['desc']) : '',
 					'label'           => isset($field['args']['name']) ? esc_attr($field['args']['name']) : '',
 					'rows'            => '4',
 					'label_type'    => 'floating'
 //					'wrap_class'      => isset( $field->css_class ) ? $field->css_class : '',
-				) );
+				));
 
 				// bug fixed in AUI 0.1.51 for name stripping []
-				$textarea = str_replace(sanitize_html_class($field['args']['id']),esc_attr($field['args']['id']),$textarea );
+				$textarea = str_replace(sanitize_html_class($field['args']['id']), esc_attr($field['args']['id']), $textarea);
 
 				echo $textarea;
 			}
@@ -565,11 +565,11 @@ 
 			<?php
 
 
-			settings_fields( 'wpinv_settings' );
+			settings_fields('wpinv_settings');
 
 			// override http referer to make it send back to the next step
 				?>
-			<input type="hidden" name="_wp_http_referer" value="<?php echo esc_url( $this->get_next_step_link() ); ?>">
+			<input type="hidden" name="_wp_http_referer" value="<?php echo esc_url($this->get_next_step_link()); ?>">
 
 			<table class="gp-setup-maps w-100 " cellspacing="0">
 
@@ -581,11 +581,11 @@ 
 
 				$page = 'wpinv_settings_general_currency_section';
 				$section = 'wpinv_settings_general_currency_section';
-				if ( ! isset( $wp_settings_fields[ $page ][ $section ] ) ) {
+				if (!isset($wp_settings_fields[$page][$section])) {
 			        return;
 			    }
 
-			    $settings =  $wp_settings_fields[ $page ][ $section ];
+			    $settings = $wp_settings_fields[$page][$section];
 
 //				print_r($settings);exit;
 
@@ -599,7 +599,7 @@ 
 
 			<p class="gp-setup-actions step text-center mt-4">
 				<input type="submit" class="btn btn-primary"
-				       value="<?php esc_attr_e( 'Continue', 'invoicing' ); ?>" name="save_step"/>
+				       value="<?php esc_attr_e('Continue', 'invoicing'); ?>" name="save_step"/>
 			</p>
 		</form>
 
@@ -613,15 +613,15 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_currency_save() {
-		check_admin_referer( 'gp-setup' );
+		check_admin_referer('gp-setup');
 
 		$generalSettings = new GeoDir_Settings_General();
-		$settings        = $generalSettings->get_settings( 'location' );
-		GeoDir_Admin_Settings::save_fields( $settings );
+		$settings        = $generalSettings->get_settings('location');
+		GeoDir_Admin_Settings::save_fields($settings);
 
-		do_action( 'geodir_setup_wizard_default_location_saved', $settings );
+		do_action('geodir_setup_wizard_default_location_saved', $settings);
 
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+		wp_redirect(esc_url_raw($this->get_next_step_link()));
 		exit;
 	}
 
@@ -636,28 +636,28 @@ 
 		<form method="post" class="text-center card-body">
 			<div class="gd-wizard-recommend">
 
-				<h2 class="gd-settings-title h3 "><?php _e( "Recommend Plugins", "geodirectory" ); ?></h2>
+				<h2 class="gd-settings-title h3 "><?php _e("Recommend Plugins", "geodirectory"); ?></h2>
 
-				<p><?php _e( "Below are a few of our own plugins that may help you.", "geodirectory" ); ?></p>
+				<p><?php _e("Below are a few of our own plugins that may help you.", "geodirectory"); ?></p>
 
 
 				<?php
 
-				include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+				include_once(ABSPATH . 'wp-admin/includes/plugin-install.php'); //for plugins_api..
 
 				$recommend_wp_plugins = self::get_recommend_wp_plugins();
 
 				//			$status = install_plugin_install_status( array("slug"=>"two-factor","version"=>""));
 				//			print_r($status);
 
-				if ( ! empty( $recommend_wp_plugins ) ) {
+				if (!empty($recommend_wp_plugins)) {
 
 				?>
 				<ul class="list-group">
 					<?php
-						foreach ( $recommend_wp_plugins as $plugin ) {
-						$status = install_plugin_install_status( array( "slug" => $plugin['slug'], "version" => "" ) );
-						$plugin_status = isset( $status['status'] ) ? $status['status'] : '';
+						foreach ($recommend_wp_plugins as $plugin) {
+						$status = install_plugin_install_status(array("slug" => $plugin['slug'], "version" => ""));
+						$plugin_status = isset($status['status']) ? $status['status'] : '';
 						?>
 							<li class="list-group-item d-flex justify-content-between align-items-center flex-wrap text-left">
 							    <span class="mr-auto"><?php echo esc_attr($plugin['name']); ?></span>
@@ -665,10 +665,10 @@ 
 									<span class="sr-only">Loading...</span>
 								</div>
 								<div class="custom-control custom-switch  mr-n2">
-									<input type="checkbox" class="custom-control-input"  <?php if( is_plugin_active( $plugin['slug'] ) ){echo "checked";} ?> onclick="if(jQuery(this).is(':checked')){}else{}">
+									<input type="checkbox" class="custom-control-input"  <?php if (is_plugin_active($plugin['slug'])) {echo "checked"; } ?> onclick="if(jQuery(this).is(':checked')){}else{}">
 									<label class="custom-control-label" for="ac-setting-updates"></label>
 								</div>
-								<small class="w-100"><?php echo esc_attr($plugin['desc'] );?></small>
+								<small class="w-100"><?php echo esc_attr($plugin['desc']); ?></small>
 							 </li>
 						<?php
 						}
@@ -687,7 +687,7 @@ 
 			</div>
 
 			<p class="gp-setup-actions step text-center mt-4">
-				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="btn btn-primary"><?php esc_attr_e( 'Continue', 'invoicing' ); ?></a>
+				<a href="<?php echo esc_url($this->get_next_step_link()); ?>" class="btn btn-primary"><?php esc_attr_e('Continue', 'invoicing'); ?></a>
 			</p>
 		</form>
 		<?php
@@ -697,25 +697,25 @@ 
 	 * A list of recommended wp.org plugins.
 	 * @return array
 	 */
-	public static function get_recommend_wp_plugins(){
+	public static function get_recommend_wp_plugins() {
 		$plugins = array(
 			'ayecode-connect' => array(
 				'url'   => 'https://wordpress.org/plugins/ayecode-connect/',
 				'slug'   => 'ayecode-connect',
 				'name'   => 'AyeCode Connect',
-				'desc'   => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
+				'desc'   => __('Documentation and Support from within your WordPress admin.', 'geodirectory'),
 			),
 			'ninja-forms' => array(
 				'url'   => 'https://wordpress.org/plugins/invoicing-quotes/',
 				'slug'   => 'invoicing-quotes',
 				'name'   => 'Customer Quotes',
-				'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.','geodirectory'),
+				'desc'   => __('Create & Send Quotes to Customers and have them accept and pay.', 'geodirectory'),
 			),
 			'userswp' => array(
 				'url'   => 'https://wordpress.org/plugins/userswp/',
 				'slug'   => 'userswp',
 				'name'   => 'UsersWP',
-				'desc'   => __('Frontend user login and registration as well as slick profile pages.','geodirectory'),
+				'desc'   => __('Frontend user login and registration as well as slick profile pages.', 'geodirectory'),
 			),
 		);
 
@@ -730,8 +730,8 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_recommend_save() {
-		check_admin_referer( 'gp-setup' );
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+		check_admin_referer('gp-setup');
+		wp_redirect(esc_url_raw($this->get_next_step_link()));
 		exit;
 	}
 
@@ -745,20 +745,20 @@ 
 		<form method="post" class="text-center card-body">
 			<div class="gp-wizard-payments">
 
-				<h2 class="gd-settings-title h3 "><?php _e( "Gateway Setup", "geodirectory" ); ?></h2>
+				<h2 class="gd-settings-title h3 "><?php _e("Gateway Setup", "geodirectory"); ?></h2>
 
-				<p><?php _e( "Below are a few gateways that can be setup in a few seconds.", "geodirectory" ); ?><br><?php _e( "We have 20+ Gateways that can be setup later.", "geodirectory" ); ?></p>
+				<p><?php _e("Below are a few gateways that can be setup in a few seconds.", "geodirectory"); ?><br><?php _e("We have 20+ Gateways that can be setup later.", "geodirectory"); ?></p>
 
 				<ul class="list-group">
 				  <li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg';?>" class="ml-n2" alt="Stripe"></span>
+				    <span class="mr-auto"><img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg'; ?>" class="ml-n2" alt="Stripe"></span>
 					<div class="spinner-border spinner-border-sm mr-2 d-none text-muted" role="status">
 						<span class="sr-only">Loading...</span>
 					</div>
 				    <span class="btn btn-sm btn-outline-primary">Connect</span>
 				  </li>
 				  <li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp';?>" class="" alt="PayPal" height="25"></span>
+				    <span class="mr-auto"><img src="<?php echo WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp'; ?>" class="" alt="PayPal" height="25"></span>
 					<div class="spinner-border spinner-border-sm mr-2 d-none text-muted" role="status">
 						<span class="sr-only">Loading...</span>
 					</div>
@@ -788,7 +788,7 @@ 
 			</div>
 
 			<p class="gp-setup-actions step text-center mt-4">
-				<a href="<?php echo esc_url( $this->get_next_step_link() ); ?>" class="btn btn-primary"><?php esc_attr_e( 'Continue', 'invoicing' ); ?></a>
+				<a href="<?php echo esc_url($this->get_next_step_link()); ?>" class="btn btn-primary"><?php esc_attr_e('Continue', 'invoicing'); ?></a>
 			</p>
 		</form>
 		<?php
@@ -802,8 +802,8 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_payments_save() {
-		check_admin_referer( 'gp-setup' );
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+		check_admin_referer('gp-setup');
+		wp_redirect(esc_url_raw($this->get_next_step_link()));
 		exit;
 	}
 
@@ -817,40 +817,40 @@ 
 		?>
 
 		<div class="text-center card-body">
-			<h1 class="h3"><?php esc_html_e( 'Awesome, you are ready to GetPaid', 'invoicing' ); ?></h1>
+			<h1 class="h3"><?php esc_html_e('Awesome, you are ready to GetPaid', 'invoicing'); ?></h1>
 
 
 			<div class="geodirectory-message geodirectory-tracker">
-				<p><?php _e( 'Thank you for choosing GetPaid!', 'invoicing' ); ?> <i class="far fa-smile-beam"></i></p>
+				<p><?php _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">
-					<h2 class="h3"><?php esc_html_e( 'Next steps', 'invoicing' ); ?></h2>
+					<h2 class="h3"><?php esc_html_e('Next steps', 'invoicing'); ?></h2>
 					<a class="btn btn-primary btn-sm"
-						                             href="<?php echo esc_url( admin_url( 'post-new.php?post_type=wpi_item' ) ); ?>"><?php esc_html_e( 'Create your first Item!', 'invoicing' ); ?></a>
+						                             href="<?php echo esc_url(admin_url('post-new.php?post_type=wpi_item')); ?>"><?php esc_html_e('Create your first Item!', 'invoicing'); ?></a>
 				</div>
 				<div class="gp-setup-next-steps-first mb-4">
-					<h2 class="h3"><?php esc_html_e( 'Examples', 'invoicing' ); ?></h2>
+					<h2 class="h3"><?php esc_html_e('Examples', 'invoicing'); ?></h2>
 					<a class="btn btn-primary btn-sm"
-					target="_blank" href="https://demos.ayecode.io/getpaid/"><?php esc_html_e( "View What's Possible", 'invoicing' ); ?></a>
+					target="_blank" href="https://demos.ayecode.io/getpaid/"><?php esc_html_e("View What's Possible", 'invoicing'); ?></a>
 
                      <a class="btn btn-outline-primary btn-sm"
-                     target="_blank" href="https://demos.ayecode.io/getpaid/"><?php esc_html_e( "View What's Possible", 'invoicing' ); ?></a>
+                     target="_blank" href="https://demos.ayecode.io/getpaid/"><?php esc_html_e("View What's Possible", 'invoicing'); ?></a>
 				</div>
 				<div class="gp-setup-next-steps-last">
-					<h2 class="h3"><?php _e( 'Learn more', 'invoicing' ); ?></h2>
+					<h2 class="h3"><?php _e('Learn more', 'invoicing'); ?></h2>
 					<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>
@@ -863,14 +863,14 @@ 
 	 * @since 2.0.0
 	 */
 	private function setup_ready_actions() {
-		GeoDir_Admin_Notices::remove_notice( 'install' );
+		GeoDir_Admin_Notices::remove_notice('install');
 
-		if ( isset( $_GET['gd_tracker_optin'] ) && isset( $_GET['gd_tracker_nonce'] ) && wp_verify_nonce( $_GET['gd_tracker_nonce'], 'gd_tracker_optin' ) ) {
-			geodir_update_option( 'usage_tracking', true );
-			GeoDir_Admin_Tracker::send_tracking_data( true );
+		if (isset($_GET['gd_tracker_optin']) && isset($_GET['gd_tracker_nonce']) && wp_verify_nonce($_GET['gd_tracker_nonce'], 'gd_tracker_optin')) {
+			geodir_update_option('usage_tracking', true);
+			GeoDir_Admin_Tracker::send_tracking_data(true);
 
-		} elseif ( isset( $_GET['gd_tracker_optout'] ) && isset( $_GET['gd_tracker_nonce'] ) && wp_verify_nonce( $_GET['gd_tracker_nonce'], 'gd_tracker_optout' ) ) {
-			geodir_update_option( 'usage_tracking', false );
+		} elseif (isset($_GET['gd_tracker_optout']) && isset($_GET['gd_tracker_nonce']) && wp_verify_nonce($_GET['gd_tracker_nonce'], 'gd_tracker_optout')) {
+			geodir_update_option('usage_tracking', false);
 		}
 	}
 

Braces +5 added lines, -5 removed lines

@@ -157,7 +157,7 @@ 
 	<?php
 	if(isset($_REQUEST['step'])){
 	$this->setup_wizard_steps();
-	}else{
+	} else{
 	echo "<div class='mb-3'>&nbsp;</div>";
 	}
 
@@ -229,7 +229,7 @@ 
 		<p class="gd-return-to-dashboard-wrap"><a class="gd-return-to-dashboard btn btn-link d-block text-muted"
 		                                          href="<?php echo esc_url( admin_url() ); ?>"><?php esc_html_e( 'Return to the WordPress Dashboard', 'invoicing' ); ?></a>
 		</p>
-	<?php }else{ ?>
+	<?php } else{ ?>
 	<p class="gd-return-to-dashboard-wrap"><a href="<?php echo esc_url( $this->get_next_step_link() ); ?>"
 		                class="btn btn-link d-block text-muted"><?php esc_html_e( 'Skip this step', 'invoicing' ); ?></a></p>
 	<?php } ?>
@@ -483,13 +483,13 @@ 
 									'label' => $label,
 									'label_type'    => 'floating'
 								));
-			}elseif($field['callback'] == 'wpinv_select_callback' || $field['callback'] == 'wpinv_country_states_callback'){
+			} elseif($field['callback'] == 'wpinv_select_callback' || $field['callback'] == 'wpinv_country_states_callback'){
 
 if($field['id']=='wpinv_settings[default_state]'){
 			$country_value  = wpinv_get_option( 'wpinv_settings[default_country]', 'US');
 $options = wpinv_get_country_states($country_value);//echo $value .'###'.$country_value;
 $class = 'getpaid_js_field-state';
-}else{
+} else{
 $options = isset($field['args']['options']) ? $field['args']['options'] : array();
 $class = 'getpaid_js_field-country';
 }
@@ -511,7 +511,7 @@ 
 					'class'           => $class,
 //					'wrap_class'      => isset( $field->css_class ) ? $field->css_class : '',
 				) );
-			}elseif($field['callback'] == 'wpinv_textarea_callback'){
+			} elseif($field['callback'] == 'wpinv_textarea_callback'){
 				$textarea =  aui()->textarea( array(
 					'id'              => isset($field['args']['id']) ? esc_attr($field['args']['id']) : '',
 					'name'            => isset($field['id']) ? esc_attr($field['id']) : '',

includes/admin/class-getpaid-admin.php

Spacing +223 added lines, -223 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main admin class.
@@ -37,13 +37,13 @@ 
     /**
 	 * Class constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 
-        $this->admin_path  = plugin_dir_path( __FILE__ );
-		$this->admin_url   = plugins_url( '/', __FILE__ );
+        $this->admin_path = plugin_dir_path(__FILE__);
+		$this->admin_url   = plugins_url('/', __FILE__);
 		$this->reports     = new GetPaid_Reports();
 
-        if ( is_admin() ) {
+        if (is_admin()) {
 			$this->init_admin_hooks();
         }
 
@@ -54,29 +54,29 @@ 
 	 *
 	 */
 	private function init_admin_hooks() {
-        add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ) );
-        add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
-        add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
-        add_action( 'admin_init', array( $this, 'activation_redirect') );
-        add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
-        add_action( 'getpaid_authenticated_admin_action_reset_tax_rates', array( $this, 'admin_reset_tax_rates' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
-		add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_customers', array( $this, 'admin_download_customers' ) );
-		add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
-		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action('admin_enqueue_scripts', array($this, 'enqeue_scripts'));
+        add_filter('admin_body_class', array($this, 'admin_body_class'));
+        add_action('admin_init', array($this, 'init_ayecode_connect_helper'));
+        add_action('admin_init', array($this, 'activation_redirect'));
+        add_action('admin_init', array($this, 'maybe_do_admin_action'));
+		add_action('admin_notices', array($this, 'show_notices'));
+		add_action('getpaid_authenticated_admin_action_rate_plugin', array($this, 'redirect_to_wordpress_rating_page'));
+		add_action('getpaid_authenticated_admin_action_send_invoice', array($this, 'send_customer_invoice'));
+		add_action('getpaid_authenticated_admin_action_send_invoice_reminder', array($this, 'send_customer_payment_reminder'));
+        add_action('getpaid_authenticated_admin_action_reset_tax_rates', array($this, 'admin_reset_tax_rates'));
+		add_action('getpaid_authenticated_admin_action_create_missing_pages', array($this, 'admin_create_missing_pages'));
+		add_action('getpaid_authenticated_admin_action_create_missing_tables', array($this, 'admin_create_missing_tables'));
+		add_action('getpaid_authenticated_admin_action_migrate_old_invoices', array($this, 'admin_migrate_old_invoices'));
+		add_action('getpaid_authenticated_admin_action_download_customers', array($this, 'admin_download_customers'));
+		add_action('getpaid_authenticated_admin_action_recalculate_discounts', array($this, 'admin_recalculate_discounts'));
+		add_filter('admin_footer_text', array($this, 'admin_footer_text'));
+		do_action('getpaid_init_admin_hooks', $this);
 
 		// Setup/welcome
-		if ( ! empty( $_GET['page'] ) ) {
-			switch ( $_GET['page'] ) {
+		if (!empty($_GET['page'])) {
+			switch ($_GET['page']) {
 				case 'gp-setup' :
-					include_once( dirname( __FILE__ ) . '/class-getpaid-admin-setup-wizard.php' );
+					include_once(dirname(__FILE__) . '/class-getpaid-admin-setup-wizard.php');
 					break;
 			}
 		}
@@ -90,37 +90,37 @@ 
 	public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+		$page    = isset($_GET['page']) ? $_GET['page'] : '';
 		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( false !== stripos( $page, 'wpi' ) || 'gp-setup' == $page ) {
+        if (false !== stripos($page, 'wpi') || 'gp-setup' == $page) {
 
             // Styles.
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/admin.css' );
-            wp_enqueue_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array( 'wp-color-picker' ), $version );
-            wp_enqueue_style( 'select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all' );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/admin.css');
+            wp_enqueue_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array('wp-color-picker'), $version);
+            wp_enqueue_style('select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all');
 
             // Scripts.
-            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array( 'jquery' ), WPINV_VERSION );
+            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array('jquery'), WPINV_VERSION);
 
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin.js' );
-            wp_enqueue_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'wp-color-picker' ),  $version );
-            wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', apply_filters( 'wpinv_admin_js_localize', $this->get_admin_i18() ) );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin.js');
+            wp_enqueue_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'wp-color-picker'), $version);
+            wp_localize_script('wpinv-admin-script', 'WPInv_Admin', apply_filters('wpinv_admin_js_localize', $this->get_admin_i18()));
 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+		if ('wpi_payment_form' == $page && $editing) {
             $this->load_payment_form_scripts();
         }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
+		if ($page == 'wpinv-subscriptions') {
+			wp_enqueue_script('postbox');
 		}
 
     }
@@ -133,32 +133,32 @@ 
         global $post;
 
 		$date_range = array(
-			'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days'
+			'period' => isset($_GET['date_range']) ? sanitize_text_field($_GET['date_range']) : '7_days'
 		);
 
-		if ( $date_range['period'] == 'custom' ) {
+		if ($date_range['period'] == 'custom') {
 			
-			if ( isset( $_GET['from'] ) ) {
-				$date_range[ 'after' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
+			if (isset($_GET['from'])) {
+				$date_range['after'] = date('Y-m-d', strtotime(sanitize_text_field($_GET['from']), current_time('timestamp')) - DAY_IN_SECONDS);
 			}
 
-			if ( isset( $_GET['to'] ) ) {
-				$date_range[ 'before' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
+			if (isset($_GET['to'])) {
+				$date_range['before'] = date('Y-m-d', strtotime(sanitize_text_field($_GET['to']), current_time('timestamp')) + DAY_IN_SECONDS);
 			}
 
 		}
 
         $i18n = array(
-            'ajax_url'                  => admin_url( 'admin-ajax.php' ),
-            'post_ID'                   => isset( $post->ID ) ? $post->ID : '',
-			'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
-			'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
-			'rest_root'                 => esc_url_raw( rest_url() ),
+            'ajax_url'                  => admin_url('admin-ajax.php'),
+            'post_ID'                   => isset($post->ID) ? $post->ID : '',
+			'wpinv_nonce'               => wp_create_nonce('wpinv-nonce'),
+			'rest_nonce'                => wp_create_nonce('wp_rest'),
+			'rest_root'                 => esc_url_raw(rest_url()),
 			'date_range'                => $date_range,
-            'add_invoice_note_nonce'    => wp_create_nonce( 'add-invoice-note' ),
-            'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ),
-            'invoice_item_nonce'        => wp_create_nonce( 'invoice-item' ),
-            'billing_details_nonce'     => wp_create_nonce( 'get-billing-details' ),
+            'add_invoice_note_nonce'    => wp_create_nonce('add-invoice-note'),
+            'delete_invoice_note_nonce' => wp_create_nonce('delete-invoice-note'),
+            'invoice_item_nonce'        => wp_create_nonce('invoice-item'),
+            'billing_details_nonce'     => wp_create_nonce('get-billing-details'),
             'tax'                       => wpinv_tax_amount(),
             'discount'                  => 0,
 			'currency_symbol'           => wpinv_currency_symbol(),
@@ -167,38 +167,38 @@ 
             'thousand_sep'              => wpinv_thousands_separator(),
             'decimal_sep'               => wpinv_decimal_separator(),
             'decimals'                  => wpinv_decimals(),
-            'save_invoice'              => __( 'Save Invoice', 'invoicing' ),
-            'status_publish'            => wpinv_status_nicename( 'publish' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'delete_tax_rate'           => __( 'Are you sure you wish to delete this tax rate?', 'invoicing' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'FillBillingDetails'        => __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' ),
-            'confirmCalcTotals'         => __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' ),
-            'AreYouSure'                => __( 'Are you sure?', 'invoicing' ),
-            'errDeleteItem'             => __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' ),
-            'delete_subscription'       => __( 'Are you sure you want to delete this subscription?', 'invoicing' ),
-            'action_edit'               => __( 'Edit', 'invoicing' ),
-            'action_cancel'             => __( 'Cancel', 'invoicing' ),
-            'item_description'          => __( 'Item Description', 'invoicing' ),
-            'invoice_description'       => __( 'Invoice Description', 'invoicing' ),
-            'discount_description'      => __( 'Discount Description', 'invoicing' ),
-			'searching'                 => __( 'Searching', 'invoicing' ),
-			'loading'                   => __( 'Loading...', 'invoicing' ),
-			'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
-			'search_items'              => __( 'Enter item name', 'invoicing' ),
+            'save_invoice'              => __('Save Invoice', 'invoicing'),
+            'status_publish'            => wpinv_status_nicename('publish'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'delete_tax_rate'           => __('Are you sure you wish to delete this tax rate?', 'invoicing'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'FillBillingDetails'        => __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing'),
+            'confirmCalcTotals'         => __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing'),
+            'AreYouSure'                => __('Are you sure?', 'invoicing'),
+            'errDeleteItem'             => __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing'),
+            'delete_subscription'       => __('Are you sure you want to delete this subscription?', 'invoicing'),
+            'action_edit'               => __('Edit', 'invoicing'),
+            'action_cancel'             => __('Cancel', 'invoicing'),
+            'item_description'          => __('Item Description', 'invoicing'),
+            'invoice_description'       => __('Invoice Description', 'invoicing'),
+            'discount_description'      => __('Discount Description', 'invoicing'),
+			'searching'                 => __('Searching', 'invoicing'),
+			'loading'                   => __('Loading...', 'invoicing'),
+			'search_customers'          => __('Enter customer name or email', 'invoicing'),
+			'search_items'              => __('Enter item name', 'invoicing'),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+		if (!empty($post) && getpaid_is_invoice_post_type($post->post_type)) {
 
-			$invoice              = new WPInv_Invoice( $post );
+			$invoice              = new WPInv_Invoice($post);
 			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
+				__('Save %s', 'invoicing'),
+				ucfirst($invoice->get_invoice_quote_type())
 			);
 
 			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
+				__('%s Description', 'invoicing'),
+				ucfirst($invoice->get_invoice_quote_type())
 			);
 
 		}
@@ -212,24 +212,24 @@ 
 	 * @param  string $footer_text
 	 * @return string
 	 */
-	public function admin_footer_text( $footer_text ) {
+	public function admin_footer_text($footer_text) {
 		global $current_screen;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+		$page = isset($_GET['page']) ? $_GET['page'] : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( apply_filters( 'getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing() ) && false !== stripos( $page, 'wpi' ) ) {
+        if (apply_filters('getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing()) && false !== stripos($page, 'wpi')) {
 
 			// Change the footer text
-			if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
+			if (!get_user_meta(get_current_user_id(), 'getpaid_admin_footer_text_rated', true)) {
 
-				$rating_url  = esc_url(
+				$rating_url = esc_url(
 					wp_nonce_url(
-						admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
+						admin_url('admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin'),
 						'getpaid-nonce',
 						'getpaid-nonce'
 						)
@@ -237,7 +237,7 @@ 
 
 				$footer_text = sprintf(
 					/* translators: %s: five stars */
-					__( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
+					__('If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing'),
 					"<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
 				);
 
@@ -245,7 +245,7 @@ 
 
 				$footer_text = sprintf(
 					/* translators: %s: GetPaid */
-					__( 'Thank you for using %s!', 'invoicing' ),
+					__('Thank you for using %s!', 'invoicing'),
 					"<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
 				);
 
@@ -262,8 +262,8 @@ 
 	 * @since  2.0.0
 	 */
 	public function redirect_to_wordpress_rating_page() {
-		update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
-		wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
+		update_user_meta(get_current_user_id(), 'getpaid_admin_footer_text_rated', 1);
+		wp_redirect('https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post');
 		exit;
 	}
 
@@ -274,30 +274,30 @@ 
 	protected function load_payment_form_scripts() {
         global $post;
 
-        wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script('vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION);
+		wp_enqueue_script('sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION);
+		wp_enqueue_script('vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array('sortable', 'vue'), WPINV_VERSION);
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js');
+		wp_register_script('wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array('wpinv-admin-script', 'vue_draggable'), $version);
 
 		wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+				'elements'      => wpinv_get_data('payment-form-elements'),
+				'form_elements' => getpaid_get_payment_form_elements($post->ID),
 				'currency'      => wpinv_currency_symbol(),
 				'position'      => wpinv_currency_position(),
 				'decimals'      => (int) wpinv_decimals(),
 				'thousands_sep' => wpinv_thousands_separator(),
 				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
+				'form_items'    => gepaid_get_form_items($post->ID),
 				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
-        wp_enqueue_script( 'wpinv-admin-payment-form-script' );
+        wp_enqueue_script('wpinv-admin-payment-form-script');
 
     }
 
@@ -308,25 +308,25 @@ 
      * @return string
 	 *
 	 */
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
 		global $pagenow, $post, $current_screen;
 
 
-        $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $page = isset($_GET['page']) ? $_GET['page'] : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
-        if ( false !== stripos( $page, 'wpi' ) ) {
-            $classes .= ' wpi-' . sanitize_key( $page );
+        if (false !== stripos($page, 'wpi')) {
+            $classes .= ' wpi-' . sanitize_key($page);
         }
 
-        if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
+        if (in_array($page, wpinv_parse_list('wpi_invoice wpi_payment_form wpi_quote'))) {
             $classes .= ' wpinv-cpt wpinv';
 		}
 		
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+		if (getpaid_is_invoice_post_type($page)) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
@@ -336,19 +336,19 @@ 
     /**
 	 * Maybe show the AyeCode Connect Notice.
 	 */
-	public function init_ayecode_connect_helper(){
+	public function init_ayecode_connect_helper() {
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-				'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-				'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-				'connect_button'    => __("Connect Site","invoicing"),
-				'connecting_button'    => __("Connecting...","invoicing"),
-				'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-				'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+				'connect_title' => __("WP Invoicing - an AyeCode product!", "invoicing"),
+				'connect_external'  => __("Please confirm you wish to connect your site?", "invoicing"),
+				'connect'           => sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", "invoicing"), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+				'connect_button'    => __("Connect Site", "invoicing"),
+				'connecting_button'    => __("Connecting...", "invoicing"),
+				'error_localhost'   => __("This service will only work with a live domain, not a localhost.", "invoicing"),
+				'error'             => __("Something went wrong, please refresh and try again.", "invoicing"),
             ),
-            array( 'wpi-addons' )
+            array('wpi-addons')
         );
 
     }
@@ -360,20 +360,20 @@ 
 	 */
 	public function activation_redirect() {
 
-		$redirected = get_option( 'wpinv_redirected_to_settings' );
+		$redirected = get_option('wpinv_redirected_to_settings');
 
-		if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
+		if (!empty($redirected) || wp_doing_ajax() || !current_user_can('manage_options')) {
 			return;
 		}
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-	    update_option( 'wpinv_redirected_to_settings', 1 );
+	    update_option('wpinv_redirected_to_settings', 1);
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
 
 	}
@@ -383,9 +383,9 @@ 
      */
     public function maybe_do_admin_action() {
 
-        if ( wpinv_current_user_can_manage_invoicing() && isset( $_REQUEST['getpaid-admin-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
-            $key = sanitize_key( $_REQUEST['getpaid-admin-action'] );
-            do_action( "getpaid_authenticated_admin_action_$key", $_REQUEST );
+        if (wpinv_current_user_can_manage_invoicing() && isset($_REQUEST['getpaid-admin-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
+            $key = sanitize_key($_REQUEST['getpaid-admin-action']);
+            do_action("getpaid_authenticated_admin_action_$key", $_REQUEST);
         }
 
     }
@@ -395,16 +395,16 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_invoice( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
+    public function send_customer_invoice($args) {
+		$sent = getpaid()->get('invoice_emails')->user_invoice(new WPInv_Invoice($args['invoice_id']), true);
 
-		if ( $sent ) {
-			$this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Invoice was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not send the invoice to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not send the invoice to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -413,16 +413,16 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+    public function send_customer_payment_reminder($args) {
+		$sent = getpaid()->get('invoice_emails')->force_send_overdue_notice(new WPInv_Invoice($args['invoice_id']));
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Payment reminder was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not sent payment reminder to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -432,8 +432,8 @@ 
      */
     public function admin_reset_tax_rates() {
 
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		update_option('wpinv_tax_rates', wpinv_get_data('tax-rates'));
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -445,8 +445,8 @@ 
     public function admin_create_missing_pages() {
 		$installer = new GetPaid_Installer();
 		$installer->create_pages();
-		$this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		$this->show_success(__('GetPaid pages updated.', 'invoicing'));
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -458,35 +458,35 @@ 
 		global $wpdb;
 		$installer = new GetPaid_Installer();
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'" ) != $wpdb->prefix . 'wpinv_subscriptions' ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'") != $wpdb->prefix . 'wpinv_subscriptions') {
 			$installer->create_subscriptions_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+			if ($wpdb->last_error !== '') {
+				$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 			}
 		}
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) != $wpdb->prefix . 'getpaid_invoices' ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'") != $wpdb->prefix . 'getpaid_invoices') {
 			$installer->create_invoices_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+			if ($wpdb->last_error !== '') {
+				$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 			}
 		}
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'" ) != $wpdb->prefix . 'getpaid_invoice_items' ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'") != $wpdb->prefix . 'getpaid_invoice_items') {
 			$installer->create_invoice_items_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+			if ($wpdb->last_error !== '') {
+				$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 			}
 		}
 
-		if ( ! $this->has_notices() ) {
-			$this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
+		if (!$this->has_notices()) {
+			$this->show_success(__('Your GetPaid tables have been updated.', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -501,10 +501,10 @@ 
 		$installer->migrate_old_invoices();
 
 		// Show an admin message.
-		$this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
+		$this->show_success(__('Your invoices have been migrated.', 'invoicing'));
 
 		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -516,18 +516,18 @@ 
     public function admin_download_customers() {
 		global $wpdb;
 
-		$output = fopen( 'php://output', 'w' ) or die( __( 'Unsupported server', 'invoicing' ) );
+		$output = fopen('php://output', 'w') or die(__('Unsupported server', 'invoicing'));
 
-		header( "Content-Type:text/csv" );
-		header( "Content-Disposition:attachment;filename=customers.csv" );
+		header("Content-Type:text/csv");
+		header("Content-Disposition:attachment;filename=customers.csv");
 
 		$post_types = '';
 
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$post_types .= $wpdb->prepare( "post_type=%s OR ", $post_type );
+		foreach (array_keys(getpaid_get_invoice_post_types()) as $post_type) {
+			$post_types .= $wpdb->prepare("post_type=%s OR ", $post_type);
 		}
 
-		$post_types = rtrim( $post_types, ' OR' );
+		$post_types = rtrim($post_types, ' OR');
 
 		$customers = $wpdb->get_col(
 			$wpdb->prepare(
@@ -536,57 +536,57 @@ 
 		);
 
 		$columns = array(
-			'name'     => __( 'Name', 'invoicing' ),
-			'email'    => __( 'Email', 'invoicing' ),
-			'country'  => __( 'Country', 'invoicing' ),
-			'state'    => __( 'State', 'invoicing' ),
-			'city'     => __( 'City', 'invoicing' ),
-			'zip'      => __( 'ZIP', 'invoicing' ),
-			'address'  => __( 'Address', 'invoicing' ),
-			'phone'    => __( 'Phone', 'invoicing' ),
-			'company'  => __( 'Company', 'invoicing' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'total'    => __( 'Total Spend', 'invoicing' ),
-			'signup'   => __( 'Date created', 'invoicing' ),
+			'name'     => __('Name', 'invoicing'),
+			'email'    => __('Email', 'invoicing'),
+			'country'  => __('Country', 'invoicing'),
+			'state'    => __('State', 'invoicing'),
+			'city'     => __('City', 'invoicing'),
+			'zip'      => __('ZIP', 'invoicing'),
+			'address'  => __('Address', 'invoicing'),
+			'phone'    => __('Phone', 'invoicing'),
+			'company'  => __('Company', 'invoicing'),
+			'invoices' => __('Invoices', 'invoicing'),
+			'total'    => __('Total Spend', 'invoicing'),
+			'signup'   => __('Date created', 'invoicing'),
 		);
 
 		// Output the csv column headers.
-		fputcsv( $output, array_values( $columns ) );
+		fputcsv($output, array_values($columns));
 
 		// Loop through
 		$table = new WPInv_Customers_Table();
-		foreach ( $customers as $customer_id ) {
+		foreach ($customers as $customer_id) {
 
-			$user = get_user_by( 'id', $customer_id );
+			$user = get_user_by('id', $customer_id);
 			$row  = array();
-			if ( empty( $user ) ) {
+			if (empty($user)) {
 				continue;
 			}
 
-			foreach ( array_keys( $columns ) as $column ) {
+			foreach (array_keys($columns) as $column) {
 
 				$method = 'column_' . $column;
 
-				if ( 'name' == $column ) {
-					$value = sanitize_text_field( $user->display_name );
-				} else if( 'email' == $column ) {
-					$value = sanitize_email( $user->user_email );
-				} else if ( is_callable( array( $table, $method ) ) ) {
-					$value = strip_tags( $table->$method( $user ) );
+				if ('name' == $column) {
+					$value = sanitize_text_field($user->display_name);
+				} else if ('email' == $column) {
+					$value = sanitize_email($user->user_email);
+				} else if (is_callable(array($table, $method))) {
+					$value = strip_tags($table->$method($user));
 				}
 
-				if ( empty( $value ) ) {
-					$value = sanitize_text_field( get_user_meta( $user->ID, '_wpinv_' . $column, true ) );
+				if (empty($value)) {
+					$value = sanitize_text_field(get_user_meta($user->ID, '_wpinv_' . $column, true));
 				}
 
 				$row[] = $value;
 
 			}
 
-			fputcsv( $output, $row );
+			fputcsv($output, $row);
 		}
 
-		fclose( $output );
+		fclose($output);
 		exit;
 
 	}
@@ -600,36 +600,36 @@ 
 
 		// Fetch all invoices that have discount codes.
 		$table    = $wpdb->prefix . 'getpaid_invoices';
-		$invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
+		$invoices = $wpdb->get_col("SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''");
 
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
-			$invoice = new WPInv_Invoice( $invoice );
+			$invoice = new WPInv_Invoice($invoice);
 
-			if ( ! $invoice->exists() ) {
+			if (!$invoice->exists()) {
 				continue;
 			}
 
 			// Abort if the discount does not exist or does not apply here.
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( ! $discount->exists() ) {
+			$discount = new WPInv_Discount($invoice->get_discount_code());
+			if (!$discount->exists()) {
 				continue;
 			}
 
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+			$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 			$invoice->recalculate_total();
 
-			if ( $invoice->get_total_discount() > 0 ) {
+			if ($invoice->get_total_discount() > 0) {
 				$invoice->save();
 			}
 
 		}
 
 		// Show an admin message.
-		$this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
+		$this->show_success(__('Discounts have been recalculated.', 'invoicing'));
 
 		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -641,8 +641,8 @@ 
      * @return array
 	 */
 	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
-        return is_array( $notices ) ? $notices : array();
+		$notices = get_option('wpinv_admin_notices');
+        return is_array($notices) ? $notices : array();
 	}
 
 	/**
@@ -652,7 +652,7 @@ 
      * @return array
 	 */
 	public function has_notices() {
-		return count( $this->get_notices() ) > 0;
+		return count($this->get_notices()) > 0;
 	}
 
 	/**
@@ -662,7 +662,7 @@ 
 	 * @since       1.0.19
 	 */
 	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
+		delete_option('wpinv_admin_notices');
 	}
 
 	/**
@@ -671,16 +671,16 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function save_notice( $type, $message ) {
+	public function save_notice($type, $message) {
 		$notices = $this->get_notices();
 
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
+		if (empty($notices[$type]) || !is_array($notices[$type])) {
+			$notices[$type] = array();
 		}
 
-		$notices[ $type ][] = $message;
+		$notices[$type][] = $message;
 
-		update_option( 'wpinv_admin_notices', $notices );
+		update_option('wpinv_admin_notices', $notices);
 	}
 
 	/**
@@ -690,8 +690,8 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
+	public function show_success($msg) {
+		$this->save_notice('success', $msg);
 	}
 
 	/**
@@ -701,8 +701,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
+	public function show_error($msg) {
+		$this->save_notice('error', $msg);
 	}
 
 	/**
@@ -712,8 +712,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
+	public function show_warning($msg) {
+		$this->save_notice('warning', $msg);
 	}
 
 	/**
@@ -723,8 +723,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
+	public function show_info($msg) {
+		$this->save_notice('info', $msg);
 	}
 
 	/**
@@ -738,30 +738,30 @@ 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+		foreach ($notices as $type => $messages) {
 
-			if ( ! is_array( $messages ) ) {
+			if (!is_array($messages)) {
 				continue;
 			}
 
-            $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
-                $message = wp_kses_post( $message );
+            $type = sanitize_key($type);
+			foreach ($messages as $message) {
+                $message = wp_kses_post($message);
 				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
             }
 
         }
 
-		foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
+		foreach (array('checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page') as $page) {
 
-			if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
-				$url     = wp_nonce_url(
-					add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+			if (!is_numeric(wpinv_get_option($page, false))) {
+				$url = wp_nonce_url(
+					add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 					'getpaid-nonce',
 					'getpaid-nonce'
 				);
-				$message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
-				$message2 = __( 'Generate Pages', 'invoicing' );
+				$message  = __('Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing');
+				$message2 = __('Generate Pages', 'invoicing');
 				echo "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>";
 				break;
 			}