AyeCode / invoicing

includes/class-wpinv-addons.php

Indentation +201 added lines, -201 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,71 +15,71 @@ 
 class WPInv_Admin_Addons extends Ayecode_Addons {
 
 
-	/**
-	 * Get the extensions page tabs.
-	 *
-	 * @return array of tabs.
-	 */
-	public function get_tabs(){
-		$tabs = array(
-			'addons' => __("Addons", "invoicing"),
+    /**
+     * Get the extensions page tabs.
+     *
+     * @return array of tabs.
+     */
+    public function get_tabs(){
+        $tabs = array(
+            'addons' => __("Addons", "invoicing"),
             'gateways' => __("Payment Gateways", "invoicing"),
             'recommended_plugins' => __("Recommended plugins", "invoicing"),
             'membership' => __("Membership", "invoicing"),
-		);
-
-		return $tabs;
-	}
-
-	/**
-	 * Get section content for the addons screen.
-	 *
-	 * @param  string $section_id
-	 *
-	 * @return array
-	 */
-	public function get_section_data( $section_id ) {
-		$section      = self::get_tab( $section_id );
-		$api_url = "https://wpinvoicing.com/edd-api/v2/products/";
-		$section_data = new stdClass();
-
-		if($section_id=='recommended_plugins'){
-			$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
-		}
-		elseif ( ! empty( $section ) ) {
-			if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
-			//if ( 1==1) {
-
-				$query_args = array( 'category' => $section_id, 'number' => 100);
-				$query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
-
-				$raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout'     => 15, ) );
-
-				if ( ! is_wp_error( $raw_section ) ) {
-					$section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
-
-					if ( ! empty( $section_data->products ) ) {
-						set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
-					}
-				}
-			}
-		}
-
-		$products = isset($section_data->products) ? $section_data->products : '';
-
-		return apply_filters( 'wpi_addons_section_data', $products, $section_id );
-	}
-
-	/**
-	 * Outputs a button.
-	 *ccc
-	 * @param string $url
-	 * @param string $text
-	 * @param string $theme
-	 * @param string $plugin
-	 */
-	public function output_button( $addon ) {
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+        );
+
+        return $tabs;
+    }
+
+    /**
+     * Get section content for the addons screen.
+     *
+     * @param  string $section_id
+     *
+     * @return array
+     */
+    public function get_section_data( $section_id ) {
+        $section      = self::get_tab( $section_id );
+        $api_url = "https://wpinvoicing.com/edd-api/v2/products/";
+        $section_data = new stdClass();
+
+        if($section_id=='recommended_plugins'){
+            $section_data->products = self::get_recommend_wp_plugins_edd_formatted();
+        }
+        elseif ( ! empty( $section ) ) {
+            if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
+            //if ( 1==1) {
+
+                $query_args = array( 'category' => $section_id, 'number' => 100);
+                $query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
+
+                $raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout'     => 15, ) );
+
+                if ( ! is_wp_error( $raw_section ) ) {
+                    $section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
+
+                    if ( ! empty( $section_data->products ) ) {
+                        set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
+                    }
+                }
+            }
+        }
+
+        $products = isset($section_data->products) ? $section_data->products : '';
+
+        return apply_filters( 'wpi_addons_section_data', $products, $section_id );
+    }
+
+    /**
+     * Outputs a button.
+     *ccc
+     * @param string $url
+     * @param string $text
+     * @param string $theme
+     * @param string $plugin
+     */
+    public function output_button( $addon ) {
+        $current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -91,123 +91,123 @@ 
 //		$install_status = 'get';
 //		$onclick = '';
 
-		$wp_org_themes = array('supreme-directory','directory-starter');
-
-		$button_args = array(
-			'type' => ($current_tab == 'addons' || $current_tab =='gateways') ? 'addons' : $current_tab,
-			'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
-			'title' => isset($addon->info->title) ? $addon->info->title : '',
-			'button_text' => __('Free','invoicing'),
-			'price_text' => __('Free','invoicing'),
-			'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
-			'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
-			'class' => 'button-primary',
-			'install_status' => 'get',
-			'installed' => false,
-			'price' => '',
-			'licensing' => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
-			'license' => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
-			'onclick' => '',
-			'slug' => isset($addon->info->slug) ? $addon->info->slug : '',
-			'active' => false,
-			'file' => '',
-			'update_url' => '',
-		);
-
-		if( ($current_tab == 'addons' || $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
-			$status = self::install_plugin_install_status($addon);
-			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-			if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
-			$button_args['update_url'] = "https://wpinvoicing.com";
-		}elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
-			$button_args['installed'] = self::is_theme_installed($addon);
-			if(!in_array($button_args['slug'],$wp_org_themes)){
-				$button_args['update_url'] = "https://wpinvoicing.com";
-			}
-		}elseif($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			$status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
-			$button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
-			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-		}
-
-		// set price
-		if(isset($addon->pricing) && !empty($addon->pricing)){
-			if(is_object($addon->pricing)){
-				$prices = (Array)$addon->pricing;
-				$button_args['price'] = reset($prices);
-			}elseif(isset($addon->pricing)){
-				$button_args['price'] = $addon->pricing;
-			}
-		}
-
-		// set price text
-		if( $button_args['price'] && $button_args['price'] != '0.00' ){
-			$button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
-		}
-
-
-		// set if installed
-		if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
-			$button_args['installed'] = true;
-		}
+        $wp_org_themes = array('supreme-directory','directory-starter');
+
+        $button_args = array(
+            'type' => ($current_tab == 'addons' || $current_tab =='gateways') ? 'addons' : $current_tab,
+            'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
+            'title' => isset($addon->info->title) ? $addon->info->title : '',
+            'button_text' => __('Free','invoicing'),
+            'price_text' => __('Free','invoicing'),
+            'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
+            'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
+            'class' => 'button-primary',
+            'install_status' => 'get',
+            'installed' => false,
+            'price' => '',
+            'licensing' => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
+            'license' => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
+            'onclick' => '',
+            'slug' => isset($addon->info->slug) ? $addon->info->slug : '',
+            'active' => false,
+            'file' => '',
+            'update_url' => '',
+        );
+
+        if( ($current_tab == 'addons' || $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
+            include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+            if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+            $status = self::install_plugin_install_status($addon);
+            $button_args['file'] = isset($status['file']) ? $status['file'] : '';
+            if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
+            $button_args['update_url'] = "https://wpinvoicing.com";
+        }elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
+            if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+            $button_args['installed'] = self::is_theme_installed($addon);
+            if(!in_array($button_args['slug'],$wp_org_themes)){
+                $button_args['update_url'] = "https://wpinvoicing.com";
+            }
+        }elseif($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug){
+            include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+            $status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
+            $button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
+            $button_args['file'] = isset($status['file']) ? $status['file'] : '';
+        }
+
+        // set price
+        if(isset($addon->pricing) && !empty($addon->pricing)){
+            if(is_object($addon->pricing)){
+                $prices = (Array)$addon->pricing;
+                $button_args['price'] = reset($prices);
+            }elseif(isset($addon->pricing)){
+                $button_args['price'] = $addon->pricing;
+            }
+        }
+
+        // set price text
+        if( $button_args['price'] && $button_args['price'] != '0.00' ){
+            $button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
+        }
+
+
+        // set if installed
+        if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
+            $button_args['installed'] = true;
+        }
 
 //		print_r($button_args);
-		// set if active
-		if($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')){
-			if($button_args['type'] != 'themes'){
-				$button_args['active'] = is_plugin_active($button_args['file']);
-			}else{
-				$button_args['active'] = self::is_theme_active($addon);
-			}
-		}
-
-		// set button text and class
-		if($button_args['active']){
-			$button_args['button_text'] = __('Active','invoicing');
-			$button_args['class'] = ' button-secondary disabled ';
-		}elseif($button_args['installed']){
-			$button_args['button_text'] = __('Activate','invoicing');
-
-			if($button_args['type'] != 'themes'){
-				if ( current_user_can( 'manage_options' ) ) {
-					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
-				}else{
-					$button_args['url'] = '#';
-				}
-			}else{
-				if ( current_user_can( 'switch_themes' ) ) {
-					$button_args['url'] = self::get_theme_activation_url($addon);
-				}else{
-					$button_args['url'] = '#';
-				}
-			}
-
-		}else{
-			if($button_args['type'] == 'recommended_plugins'){
-				$button_args['button_text'] = __('Install','invoicing');
-			}else{
-				$button_args['button_text'] = __('Get it','invoicing');
-
-				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
+        // set if active
+        if($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')){
+            if($button_args['type'] != 'themes'){
+                $button_args['active'] = is_plugin_active($button_args['file']);
+            }else{
+                $button_args['active'] = self::is_theme_active($addon);
+            }
+        }
+
+        // set button text and class
+        if($button_args['active']){
+            $button_args['button_text'] = __('Active','invoicing');
+            $button_args['class'] = ' button-secondary disabled ';
+        }elseif($button_args['installed']){
+            $button_args['button_text'] = __('Activate','invoicing');
+
+            if($button_args['type'] != 'themes'){
+                if ( current_user_can( 'manage_options' ) ) {
+                    $button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
+                }else{
+                    $button_args['url'] = '#';
+                }
+            }else{
+                if ( current_user_can( 'switch_themes' ) ) {
+                    $button_args['url'] = self::get_theme_activation_url($addon);
+                }else{
+                    $button_args['url'] = '#';
+                }
+            }
+
+        }else{
+            if($button_args['type'] == 'recommended_plugins'){
+                $button_args['button_text'] = __('Install','invoicing');
+            }else{
+                $button_args['button_text'] = __('Get it','invoicing');
+
+                /*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
 					$button_args['button_text'] = __('Install','invoicing');
 					$button_args['url'] = self::get_theme_install_url($button_args['slug']);
 					$button_args['onclick'] = 'gd_set_button_installing(this);';
 				}*/
 
-			}
-		}
+            }
+        }
 
 		
-		// filter the button arguments
-		$button_args = apply_filters('edd_api_button_args',$button_args);
+        // filter the button arguments
+        $button_args = apply_filters('edd_api_button_args',$button_args);
 //		print_r($button_args);
-		// set price text
-		if(isset($button_args['price_text'])){
-			?>
+        // set price text
+        if(isset($button_args['price_text'])){
+            ?>
 			<a
 				target="_blank"
 				class="addons-price-text"
@@ -215,15 +215,15 @@ 
 				<?php echo esc_html( $button_args['price_text'] ); ?>
 			</a>
 			<?php
-		}
+        }
 
 
-		$target = '';
-		if ( ! empty( $button_args['url'] ) ) {
-			$target = strpos($button_args['url'], get_site_url()) !== false ? '' : ' target="_blank" ';
-		}
+        $target = '';
+        if ( ! empty( $button_args['url'] ) ) {
+            $target = strpos($button_args['url'], get_site_url()) !== false ? '' : ' target="_blank" ';
+        }
 
-		?>
+        ?>
 		<a
 			data-licence="<?php echo esc_attr($button_args['license']);?>"
 			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0;?>"
@@ -246,28 +246,28 @@ 
 		<?php
 
 
-	}
-
-
-	/**
-	 * Handles output of the addons page in admin.
-	 */
-	public function output() {
-		$tabs            = self::get_tabs();
-		$sections        = self::get_sections();
-		$theme           = wp_get_theme();
-		$section_keys    = array_keys( $sections );
-		$current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
-		include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
-	}
-
-	/**
-	 * A list of recommended wp.org plugins.
-	 * @return array
-	 */
-	public function get_recommend_wp_plugins(){
-		$plugins = array(
+    }
+
+
+    /**
+     * Handles output of the addons page in admin.
+     */
+    public function output() {
+        $tabs            = self::get_tabs();
+        $sections        = self::get_sections();
+        $theme           = wp_get_theme();
+        $section_keys    = array_keys( $sections );
+        $current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
+        $current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+        include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
+    }
+
+    /**
+     * A list of recommended wp.org plugins.
+     * @return array
+     */
+    public function get_recommend_wp_plugins(){
+        $plugins = array(
             'invoicing-quotes' => array(
                 'url'   => 'https://wordpress.org/plugins/invoicing-quotes/',
                 'slug'   => 'invoicing-quotes',
@@ -286,8 +286,8 @@ 
                 'name'   => 'UsersWP',
                 'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.','invoicing'),
             ),
-		);
+        );
 
-		return $plugins;
-	}
+        return $plugins;
+    }
 }

includes/admin/html-admin-page-addons.php

Indentation +64 added lines, -64 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 add_ThickBox();
 ?>
@@ -14,18 +14,18 @@ 
 	<?php if ( $tabs ){ ?>
 		<nav class="nav-tab-wrapper wpi-nav-tab-wrapper">
 			<?php
-			foreach ( $tabs as $name => $label ) {
-				echo '<a href="' . admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . $label . '</a>';
-			}
-			do_action( 'wpi_addons_tabs' );
-			?>
+            foreach ( $tabs as $name => $label ) {
+                echo '<a href="' . admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . $label . '</a>';
+            }
+            do_action( 'wpi_addons_tabs' );
+            ?>
 		</nav>
 
 		<?php
 
-		if($current_tab == 'membership'){
+        if($current_tab == 'membership'){
 
-			?>
+            ?>
 
 			<div class="wpi-membership-tab-conatiner">
 				<div class="membership-content">
@@ -36,9 +36,9 @@ 
 					<h2><?php _e("Have a membership key?","invoicing");?></h2>
 					<p>
 						<?php
-						$wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
-						echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108,12351));
-						?>
+                        $wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
+                        echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108,12351));
+                        ?>
 					</p>
 				<?php }?>
 
@@ -48,13 +48,13 @@ 
 							<div class="feature-list">
 								<ul>
 									<?php
-									$addon_obj = new WPInv_Admin_Addons();
-									if ($addons = $addon_obj->get_section_data( 'addons' ) ) {
-										foreach ( $addons as $addon ) {
-											echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
-										}
-									}
-									?>
+                                    $addon_obj = new WPInv_Admin_Addons();
+                                    if ($addons = $addon_obj->get_section_data( 'addons' ) ) {
+                                        foreach ( $addons as $addon ) {
+                                            echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
+                                        }
+                                    }
+                                    ?>
 									</ul>
 
 									<div class="feature-cta">
@@ -65,12 +65,12 @@ 
 									<h3><?php _e("Included Gateways:","invoicing");?></h3>
 									<ul>
 										<?php
-										if ($addons = $addon_obj->get_section_data( 'gateways' ) ) {
-											foreach ( $addons as $addon ) {
-												echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
-											}
-										}
-										?>
+                                        if ($addons = $addon_obj->get_section_data( 'gateways' ) ) {
+                                            foreach ( $addons as $addon ) {
+                                                echo '<li><i class="far fa-check-circle fa-sm"></i> '.esc_html( $addon->info->title ).'</li>';
+                                            }
+                                        }
+                                        ?>
 								</ul>
 							</div>
 
@@ -81,8 +81,8 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image2.png', dirname(__FILE__) ) . '" > ';
-								?>
+                                    echo '<img src="' . plugins_url( 'images/t-image2.png', dirname(__FILE__) ) . '" > ';
+                                ?>
 							</div>
 							<div class="t-content">
 								<p>
@@ -101,8 +101,8 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image1.png', dirname(__FILE__) ) . '" > ';
-								?>
+                                    echo '<img src="' . plugins_url( 'images/t-image1.png', dirname(__FILE__) ) . '" > ';
+                                ?>
 							</div>
 							<div class="t-content">
 								<p>
@@ -126,20 +126,20 @@ 
 			</div>
 		</div>
 			<?php
-		}else{
-			$installed_plugins = get_plugins();
+        }else{
+            $installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
-			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
-				?>
+            if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
+                ?>
 				<ul class="wpi-products"><?php foreach ( $addons as $addon ) :
                         if(965==$addon->info->id){continue;}// don't show quote add on
-						?><li class="wpi-product">
+                        ?><li class="wpi-product">
 								<div class="wpi-product-title">
 									<h3><?php
-										if ( ! empty( $addon->info->excerpt) ){
-											echo wpi_help_tip( $addon->info->excerpt );
-										}
-										echo esc_html( $addon->info->title ); ?></h3>
+                                        if ( ! empty( $addon->info->excerpt) ){
+                                            echo wpi_help_tip( $addon->info->excerpt );
+                                        }
+                                        echo esc_html( $addon->info->title ); ?></h3>
 								</div>
 
 								<span class="wpi-product-image">
@@ -147,27 +147,27 @@ 
 										<img src="<?php echo esc_attr( $addon->info->thumbnail ); ?>"/>
 									<?php endif;
 
-									if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
-										echo '<a href="'.admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug).'&width=770&height=660&TB_iframe=true" class="thickbox" >';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
-										echo '</a>';
-									}elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
-										if(defined('WP_EASY_UPDATES_ACTIVE')){
-											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpinvoicing.com&TB_iframe=true');
-										}else{
-											// if installed show activation link
-											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
-												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
-												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
-											}
-										}
-										echo '<a href="'.$url.'" class="thickbox">';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
-										echo '</a>';
-									}
-
-									?>
+                                    if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
+                                        echo '<a href="'.admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug).'&width=770&height=660&TB_iframe=true" class="thickbox" >';
+                                        echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+                                        echo '</a>';
+                                    }elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
+                                        if(defined('WP_EASY_UPDATES_ACTIVE')){
+                                            $url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpinvoicing.com&TB_iframe=true');
+                                        }else{
+                                            // if installed show activation link
+                                            if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
+                                                $url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
+                                            }else{
+                                                $url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
+                                            }
+                                        }
+                                        echo '<a href="'.$url.'" class="thickbox">';
+                                        echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+                                        echo '</a>';
+                                    }
+
+                                    ?>
 
 								</span>
 
@@ -175,15 +175,15 @@ 
 								<span class="wpi-product-button">
 									<?php
                                     $addon_obj->output_button( $addon );
-									?>
+                                    ?>
 								</span>
 
 								<span class="wpi-price"><?php //print_r($addon); //echo wp_kses_post( $addon->price ); ?></span></li><?php endforeach; ?></ul>
 			<?php endif;
-		}
+        }
 
-	}
-	?>
+    }
+    ?>
 
 
 	<div class="clearfix" ></div>
@@ -202,8 +202,8 @@ 
 			<input class="wpeu-licence-key" type="text" placeholder="<?php _e("Enter your licence key",'invoicing');?>"> <button class="button-primary wpeu-licence-popup-button" ><?php _e("Install",'invoicing');?></button>
 			<br>
 			<?php
-			echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
-			?>
+            echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
+            ?>
 		</span>
 	</div>
 

widgets/invoice-history.php

Indentation +15 added lines, -15 removed lines

@@ -46,25 +46,25 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    ob_start();
+        ob_start();
 
-	    do_action( 'wpinv_before_user_invoice_history' );
-	    wpinv_get_template_part( 'wpinv-invoice-history' );
-	    do_action( 'wpinv_after_user_invoice_history' );
+        do_action( 'wpinv_before_user_invoice_history' );
+        wpinv_get_template_part( 'wpinv-invoice-history' );
+        do_action( 'wpinv_after_user_invoice_history' );
 
-	    $output = ob_get_clean();
-	    return trim($output);
+        $output = ob_get_clean();
+        return trim($output);
 
     }
 

widgets/invoice-messages.php

Indentation +12 added lines, -12 removed lines

@@ -44,22 +44,22 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    ob_start();
+        ob_start();
 
-	    wpinv_print_errors();
+        wpinv_print_errors();
 
-	    return '<div class="wpinv">' . ob_get_clean() . '</div>';
+        return '<div class="wpinv">' . ob_get_clean() . '</div>';
 
     }
 

widgets/checkout.php

Indentation +10 added lines, -10 removed lines

@@ -46,18 +46,18 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    return wpinv_checkout_form();
+        return wpinv_checkout_form();
 
     }
 

widgets/subscriptions.php

Indentation +15 added lines, -15 removed lines

@@ -46,25 +46,25 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    ob_start();
+        ob_start();
 
-	    do_action( 'wpinv_before_user_subscriptions' );
-	    wpinv_get_template_part( 'wpinv-subscriptions-history' );
-	    do_action( 'wpinv_after_user_subscriptions' );
+        do_action( 'wpinv_before_user_subscriptions' );
+        wpinv_get_template_part( 'wpinv-subscriptions-history' );
+        do_action( 'wpinv_after_user_subscriptions' );
 
-	    $output = ob_get_clean();
-	    return trim($output);
+        $output = ob_get_clean();
+        return trim($output);
 
     }
 

widgets/invoice-receipt.php

Indentation +15 added lines, -15 removed lines

@@ -44,25 +44,25 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    ob_start();
+        ob_start();
 
-	    do_action( 'wpinv_success_content_before' );
-	    echo wpinv_payment_receipt( $args );
-	    do_action( 'wpinv_success_content_after' );
+        do_action( 'wpinv_success_content_before' );
+        echo wpinv_payment_receipt( $args );
+        do_action( 'wpinv_success_content_after' );
 
-	    $output = ob_get_clean();
-	    return trim($output);
+        $output = ob_get_clean();
+        return trim($output);
 
     }
 

widgets/buy-item.php

Indentation +43 added lines, -43 removed lines

@@ -38,29 +38,29 @@ 
                     'advanced'    => false
                 ),
                 'buy_items'  => array(
-	                'title'       => __( 'Items to buy', 'invoicing' ),
-	                'desc'        => __( 'Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing' ),
-	                'type'        => 'text',
-	                'desc_tip'    => true,
-	                'default'     => '',
-	                'placeholder' => __('Items to buy','invoicing'),
-	                'advanced'    => false
+                    'title'       => __( 'Items to buy', 'invoicing' ),
+                    'desc'        => __( 'Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing' ),
+                    'type'        => 'text',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'placeholder' => __('Items to buy','invoicing'),
+                    'advanced'    => false
                 ),
                 'button_label'  => array(
-	                'title'       => __( 'Button Label', 'invoicing' ),
-	                'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
-	                'type'        => 'text',
-	                'desc_tip'    => true,
-	                'default'     => '',
-	                'advanced'    => true
+                    'title'       => __( 'Button Label', 'invoicing' ),
+                    'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
+                    'type'        => 'text',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'advanced'    => true
                 ),
                 'post_id'  => array(
-	                'title'       => __( 'Post ID', 'invoicing' ),
-	                'desc'        => __( 'Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing' ),
-	                'type'        => 'number',
-	                'desc_tip'    => true,
-	                'default'     => '',
-	                'advanced'    => true
+                    'title'       => __( 'Post ID', 'invoicing' ),
+                    'desc'        => __( 'Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing' ),
+                    'type'        => 'number',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'advanced'    => true
                 ),
             )
 
@@ -70,36 +70,36 @@ 
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return string
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return string
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    $defaults = array(
-		    'buy_items'     => '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
-		    'button_label'  => __( 'Buy Now', 'invoicing' ), // the button title
-		    'post_id'   => '', // any related post_id
-	    );
+        $defaults = array(
+            'buy_items'     => '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
+            'button_label'  => __( 'Buy Now', 'invoicing' ), // the button title
+            'post_id'   => '', // any related post_id
+        );
 
-	    /**
-	     * Parse incoming $args into an array and merge it with $defaults
-	     */
-	    $args = wp_parse_args( $args, $defaults );
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
 
-	    $post_id = isset( $args['post_id'] ) ? (int)$args['post_id'] : 0;
+        $post_id = isset( $args['post_id'] ) ? (int)$args['post_id'] : 0;
 
-	    $html = '<div class="wpi-buy-button-wrapper wpi-g">';
-	    $html .= '<button class="button button-primary wpi-buy-button" type="button" onclick="wpi_buy(this,\'' . $args['buy_items'] . '\',' . $post_id . ');">' . $args['button_label'] . '</button>';
-	    $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
-	    $html .= '</div>';
+        $html = '<div class="wpi-buy-button-wrapper wpi-g">';
+        $html .= '<button class="button button-primary wpi-buy-button" type="button" onclick="wpi_buy(this,\'' . $args['buy_items'] . '\',' . $post_id . ');">' . $args['button_label'] . '</button>';
+        $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
+        $html .= '</div>';
 
-	    return $html;
+        return $html;
 
     }
 

includes/wpinv-address-functions.php

Indentation +290 added lines, -290 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 );
 }
 
 function wpinv_is_base_country( $country ) {
@@ -40,9 +40,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', false );
+    $state = wpinv_get_option( 'default_state', false );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -115,260 +115,260 @@ 
 }
 
 function wpinv_get_country_list( $first_empty = false ) {
-	$countries = array(
-		'US' => __('United States', 'invoicing'),
-		'CA' => __('Canada', 'invoicing'),
-		'GB' => __('United Kingdom', 'invoicing'),
-		'AF' => __('Afghanistan', 'invoicing'),
-		'AX' => __('Aland Islands', 'invoicing'),
-		'AL' => __('Albania', 'invoicing'),
-		'DZ' => __('Algeria', 'invoicing'),
-		'AS' => __('American Samoa', 'invoicing'),
-		'AD' => __('Andorra', 'invoicing'),
-		'AO' => __('Angola', 'invoicing'),
-		'AI' => __('Anguilla', 'invoicing'),
-		'AQ' => __('Antarctica', 'invoicing'),
-		'AG' => __('Antigua and Barbuda', 'invoicing'),
-		'AR' => __('Argentina', 'invoicing'),
-		'AM' => __('Armenia', 'invoicing'),
-		'AW' => __('Aruba', 'invoicing'),
-		'AU' => __('Australia', 'invoicing'),
-		'AT' => __('Austria', 'invoicing'),
-		'AZ' => __('Azerbaijan', 'invoicing'),
-		'BS' => __('Bahamas', 'invoicing'),
-		'BH' => __('Bahrain', 'invoicing'),
-		'BD' => __('Bangladesh', 'invoicing'),
-		'BB' => __('Barbados', 'invoicing'),
-		'BY' => __('Belarus', 'invoicing'),
-		'BE' => __('Belgium', 'invoicing'),
-		'BZ' => __('Belize', 'invoicing'),
-		'BJ' => __('Benin', 'invoicing'),
-		'BM' => __('Bermuda', 'invoicing'),
-		'BT' => __('Bhutan', 'invoicing'),
-		'BO' => __('Bolivia', 'invoicing'),
-		'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
-		'BA' => __('Bosnia and Herzegovina', 'invoicing'),
-		'BW' => __('Botswana', 'invoicing'),
-		'BV' => __('Bouvet Island', 'invoicing'),
-		'BR' => __('Brazil', 'invoicing'),
-		'IO' => __('British Indian Ocean Territory', 'invoicing'),
-		'BN' => __('Brunei Darrussalam', 'invoicing'),
-		'BG' => __('Bulgaria', 'invoicing'),
-		'BF' => __('Burkina Faso', 'invoicing'),
-		'BI' => __('Burundi', 'invoicing'),
-		'KH' => __('Cambodia', 'invoicing'),
-		'CM' => __('Cameroon', 'invoicing'),
-		'CV' => __('Cape Verde', 'invoicing'),
-		'KY' => __('Cayman Islands', 'invoicing'),
-		'CF' => __('Central African Republic', 'invoicing'),
-		'TD' => __('Chad', 'invoicing'),
-		'CL' => __('Chile', 'invoicing'),
-		'CN' => __('China', 'invoicing'),
-		'CX' => __('Christmas Island', 'invoicing'),
-		'CC' => __('Cocos Islands', 'invoicing'),
-		'CO' => __('Colombia', 'invoicing'),
-		'KM' => __('Comoros', 'invoicing'),
-		'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
-		'CG' => __('Congo, Republic of', 'invoicing'),
-		'CK' => __('Cook Islands', 'invoicing'),
-		'CR' => __('Costa Rica', 'invoicing'),
-		'CI' => __('Cote d\'Ivoire', 'invoicing'),
-		'HR' => __('Croatia/Hrvatska', 'invoicing'),
-		'CU' => __('Cuba', 'invoicing'),
-		'CW' => __('CuraÇao', 'invoicing'),
-		'CY' => __('Cyprus', 'invoicing'),
-		'CZ' => __('Czech Republic', 'invoicing'),
-		'DK' => __('Denmark', 'invoicing'),
-		'DJ' => __('Djibouti', 'invoicing'),
-		'DM' => __('Dominica', 'invoicing'),
-		'DO' => __('Dominican Republic', 'invoicing'),
-		'TP' => __('East Timor', 'invoicing'),
-		'EC' => __('Ecuador', 'invoicing'),
-		'EG' => __('Egypt', 'invoicing'),
-		'GQ' => __('Equatorial Guinea', 'invoicing'),
-		'SV' => __('El Salvador', 'invoicing'),
-		'ER' => __('Eritrea', 'invoicing'),
-		'EE' => __('Estonia', 'invoicing'),
-		'ET' => __('Ethiopia', 'invoicing'),
-		'FK' => __('Falkland Islands', 'invoicing'),
-		'FO' => __('Faroe Islands', 'invoicing'),
-		'FJ' => __('Fiji', 'invoicing'),
-		'FI' => __('Finland', 'invoicing'),
-		'FR' => __('France', 'invoicing'),
-		'GF' => __('French Guiana', 'invoicing'),
-		'PF' => __('French Polynesia', 'invoicing'),
-		'TF' => __('French Southern Territories', 'invoicing'),
-		'GA' => __('Gabon', 'invoicing'),
-		'GM' => __('Gambia', 'invoicing'),
-		'GE' => __('Georgia', 'invoicing'),
-		'DE' => __('Germany', 'invoicing'),
-		'GR' => __('Greece', 'invoicing'),
-		'GH' => __('Ghana', 'invoicing'),
-		'GI' => __('Gibraltar', 'invoicing'),
-		'GL' => __('Greenland', 'invoicing'),
-		'GD' => __('Grenada', 'invoicing'),
-		'GP' => __('Guadeloupe', 'invoicing'),
-		'GU' => __('Guam', 'invoicing'),
-		'GT' => __('Guatemala', 'invoicing'),
-		'GG' => __('Guernsey', 'invoicing'),
-		'GN' => __('Guinea', 'invoicing'),
-		'GW' => __('Guinea-Bissau', 'invoicing'),
-		'GY' => __('Guyana', 'invoicing'),
-		'HT' => __('Haiti', 'invoicing'),
-		'HM' => __('Heard and McDonald Islands', 'invoicing'),
-		'VA' => __('Holy See (City Vatican State)', 'invoicing'),
-		'HN' => __('Honduras', 'invoicing'),
-		'HK' => __('Hong Kong', 'invoicing'),
-		'HU' => __('Hungary', 'invoicing'),
-		'IS' => __('Iceland', 'invoicing'),
-		'IN' => __('India', 'invoicing'),
-		'ID' => __('Indonesia', 'invoicing'),
-		'IR' => __('Iran', 'invoicing'),
-		'IQ' => __('Iraq', 'invoicing'),
-		'IE' => __('Ireland', 'invoicing'),
-		'IM' => __('Isle of Man', 'invoicing'),
-		'IL' => __('Israel', 'invoicing'),
-		'IT' => __('Italy', 'invoicing'),
-		'JM' => __('Jamaica', 'invoicing'),
-		'JP' => __('Japan', 'invoicing'),
-		'JE' => __('Jersey', 'invoicing'),
-		'JO' => __('Jordan', 'invoicing'),
-		'KZ' => __('Kazakhstan', 'invoicing'),
-		'KE' => __('Kenya', 'invoicing'),
-		'KI' => __('Kiribati', 'invoicing'),
-		'KW' => __('Kuwait', 'invoicing'),
-		'KG' => __('Kyrgyzstan', 'invoicing'),
-		'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
-		'LV' => __('Latvia', 'invoicing'),
-		'LB' => __('Lebanon', 'invoicing'),
-		'LS' => __('Lesotho', 'invoicing'),
-		'LR' => __('Liberia', 'invoicing'),
-		'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
-		'LI' => __('Liechtenstein', 'invoicing'),
-		'LT' => __('Lithuania', 'invoicing'),
-		'LU' => __('Luxembourg', 'invoicing'),
-		'MO' => __('Macau', 'invoicing'),
-		'MK' => __('Macedonia', 'invoicing'),
-		'MG' => __('Madagascar', 'invoicing'),
-		'MW' => __('Malawi', 'invoicing'),
-		'MY' => __('Malaysia', 'invoicing'),
-		'MV' => __('Maldives', 'invoicing'),
-		'ML' => __('Mali', 'invoicing'),
-		'MT' => __('Malta', 'invoicing'),
-		'MH' => __('Marshall Islands', 'invoicing'),
-		'MQ' => __('Martinique', 'invoicing'),
-		'MR' => __('Mauritania', 'invoicing'),
-		'MU' => __('Mauritius', 'invoicing'),
-		'YT' => __('Mayotte', 'invoicing'),
-		'MX' => __('Mexico', 'invoicing'),
-		'FM' => __('Micronesia', 'invoicing'),
-		'MD' => __('Moldova, Republic of', 'invoicing'),
-		'MC' => __('Monaco', 'invoicing'),
-		'MN' => __('Mongolia', 'invoicing'),
-		'ME' => __('Montenegro', 'invoicing'),
-		'MS' => __('Montserrat', 'invoicing'),
-		'MA' => __('Morocco', 'invoicing'),
-		'MZ' => __('Mozambique', 'invoicing'),
-		'MM' => __('Myanmar', 'invoicing'),
-		'NA' => __('Namibia', 'invoicing'),
-		'NR' => __('Nauru', 'invoicing'),
-		'NP' => __('Nepal', 'invoicing'),
-		'NL' => __('Netherlands', 'invoicing'),
-		'AN' => __('Netherlands Antilles', 'invoicing'),
-		'NC' => __('New Caledonia', 'invoicing'),
-		'NZ' => __('New Zealand', 'invoicing'),
-		'NI' => __('Nicaragua', 'invoicing'),
-		'NE' => __('Niger', 'invoicing'),
-		'NG' => __('Nigeria', 'invoicing'),
-		'NU' => __('Niue', 'invoicing'),
-		'NF' => __('Norfolk Island', 'invoicing'),
-		'KP' => __('North Korea', 'invoicing'),
-		'MP' => __('Northern Mariana Islands', 'invoicing'),
-		'NO' => __('Norway', 'invoicing'),
-		'OM' => __('Oman', 'invoicing'),
-		'PK' => __('Pakistan', 'invoicing'),
-		'PW' => __('Palau', 'invoicing'),
-		'PS' => __('Palestinian Territories', 'invoicing'),
-		'PA' => __('Panama', 'invoicing'),
-		'PG' => __('Papua New Guinea', 'invoicing'),
-		'PY' => __('Paraguay', 'invoicing'),
-		'PE' => __('Peru', 'invoicing'),
-		'PH' => __('Phillipines', 'invoicing'),
-		'PN' => __('Pitcairn Island', 'invoicing'),
-		'PL' => __('Poland', 'invoicing'),
-		'PT' => __('Portugal', 'invoicing'),
-		'PR' => __('Puerto Rico', 'invoicing'),
-		'QA' => __('Qatar', 'invoicing'),
-		'XK' => __('Republic of Kosovo', 'invoicing'),
-		'RE' => __('Reunion Island', 'invoicing'),
-		'RO' => __('Romania', 'invoicing'),
-		'RU' => __('Russian Federation', 'invoicing'),
-		'RW' => __('Rwanda', 'invoicing'),
-		'BL' => __('Saint Barthélemy', 'invoicing'),
-		'SH' => __('Saint Helena', 'invoicing'),
-		'KN' => __('Saint Kitts and Nevis', 'invoicing'),
-		'LC' => __('Saint Lucia', 'invoicing'),
-		'MF' => __('Saint Martin (French)', 'invoicing'),
-		'SX' => __('Saint Martin (Dutch)', 'invoicing'),
-		'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
-		'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
-		'SM' => __('San Marino', 'invoicing'),
-		'ST' => __('São Tomé and Príncipe', 'invoicing'),
-		'SA' => __('Saudi Arabia', 'invoicing'),
-		'SN' => __('Senegal', 'invoicing'),
-		'RS' => __('Serbia', 'invoicing'),
-		'SC' => __('Seychelles', 'invoicing'),
-		'SL' => __('Sierra Leone', 'invoicing'),
-		'SG' => __('Singapore', 'invoicing'),
-		'SK' => __('Slovak Republic', 'invoicing'),
-		'SI' => __('Slovenia', 'invoicing'),
-		'SB' => __('Solomon Islands', 'invoicing'),
-		'SO' => __('Somalia', 'invoicing'),
-		'ZA' => __('South Africa', 'invoicing'),
-		'GS' => __('South Georgia', 'invoicing'),
-		'KR' => __('South Korea', 'invoicing'),
-		'SS' => __('South Sudan', 'invoicing'),
-		'ES' => __('Spain', 'invoicing'),
-		'LK' => __('Sri Lanka', 'invoicing'),
-		'SD' => __('Sudan', 'invoicing'),
-		'SR' => __('Suriname', 'invoicing'),
-		'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
-		'SZ' => __('Swaziland', 'invoicing'),
-		'SE' => __('Sweden', 'invoicing'),
-		'CH' => __('Switzerland', 'invoicing'),
-		'SY' => __('Syrian Arab Republic', 'invoicing'),
-		'TW' => __('Taiwan', 'invoicing'),
-		'TJ' => __('Tajikistan', 'invoicing'),
-		'TZ' => __('Tanzania', 'invoicing'),
-		'TH' => __('Thailand', 'invoicing'),
-		'TL' => __('Timor-Leste', 'invoicing'),
-		'TG' => __('Togo', 'invoicing'),
-		'TK' => __('Tokelau', 'invoicing'),
-		'TO' => __('Tonga', 'invoicing'),
-		'TT' => __('Trinidad and Tobago', 'invoicing'),
-		'TN' => __('Tunisia', 'invoicing'),
-		'TR' => __('Turkey', 'invoicing'),
-		'TM' => __('Turkmenistan', 'invoicing'),
-		'TC' => __('Turks and Caicos Islands', 'invoicing'),
-		'TV' => __('Tuvalu', 'invoicing'),
-		'UG' => __('Uganda', 'invoicing'),
-		'UA' => __('Ukraine', 'invoicing'),
-		'AE' => __('United Arab Emirates', 'invoicing'),
-		'UY' => __('Uruguay', 'invoicing'),
-		'UM' => __('US Minor Outlying Islands', 'invoicing'),
-		'UZ' => __('Uzbekistan', 'invoicing'),
-		'VU' => __('Vanuatu', 'invoicing'),
-		'VE' => __('Venezuela', 'invoicing'),
-		'VN' => __('Vietnam', 'invoicing'),
-		'VG' => __('Virgin Islands (British)', 'invoicing'),
-		'VI' => __('Virgin Islands (USA)', 'invoicing'),
-		'WF' => __('Wallis and Futuna Islands', 'invoicing'),
-		'EH' => __('Western Sahara', 'invoicing'),
-		'WS' => __('Western Samoa', 'invoicing'),
-		'YE' => __('Yemen', 'invoicing'),
-		'ZM' => __('Zambia', 'invoicing'),
-		'ZW' => __('Zimbabwe', 'invoicing'),
-	);
+    $countries = array(
+        'US' => __('United States', 'invoicing'),
+        'CA' => __('Canada', 'invoicing'),
+        'GB' => __('United Kingdom', 'invoicing'),
+        'AF' => __('Afghanistan', 'invoicing'),
+        'AX' => __('Aland Islands', 'invoicing'),
+        'AL' => __('Albania', 'invoicing'),
+        'DZ' => __('Algeria', 'invoicing'),
+        'AS' => __('American Samoa', 'invoicing'),
+        'AD' => __('Andorra', 'invoicing'),
+        'AO' => __('Angola', 'invoicing'),
+        'AI' => __('Anguilla', 'invoicing'),
+        'AQ' => __('Antarctica', 'invoicing'),
+        'AG' => __('Antigua and Barbuda', 'invoicing'),
+        'AR' => __('Argentina', 'invoicing'),
+        'AM' => __('Armenia', 'invoicing'),
+        'AW' => __('Aruba', 'invoicing'),
+        'AU' => __('Australia', 'invoicing'),
+        'AT' => __('Austria', 'invoicing'),
+        'AZ' => __('Azerbaijan', 'invoicing'),
+        'BS' => __('Bahamas', 'invoicing'),
+        'BH' => __('Bahrain', 'invoicing'),
+        'BD' => __('Bangladesh', 'invoicing'),
+        'BB' => __('Barbados', 'invoicing'),
+        'BY' => __('Belarus', 'invoicing'),
+        'BE' => __('Belgium', 'invoicing'),
+        'BZ' => __('Belize', 'invoicing'),
+        'BJ' => __('Benin', 'invoicing'),
+        'BM' => __('Bermuda', 'invoicing'),
+        'BT' => __('Bhutan', 'invoicing'),
+        'BO' => __('Bolivia', 'invoicing'),
+        'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
+        'BA' => __('Bosnia and Herzegovina', 'invoicing'),
+        'BW' => __('Botswana', 'invoicing'),
+        'BV' => __('Bouvet Island', 'invoicing'),
+        'BR' => __('Brazil', 'invoicing'),
+        'IO' => __('British Indian Ocean Territory', 'invoicing'),
+        'BN' => __('Brunei Darrussalam', 'invoicing'),
+        'BG' => __('Bulgaria', 'invoicing'),
+        'BF' => __('Burkina Faso', 'invoicing'),
+        'BI' => __('Burundi', 'invoicing'),
+        'KH' => __('Cambodia', 'invoicing'),
+        'CM' => __('Cameroon', 'invoicing'),
+        'CV' => __('Cape Verde', 'invoicing'),
+        'KY' => __('Cayman Islands', 'invoicing'),
+        'CF' => __('Central African Republic', 'invoicing'),
+        'TD' => __('Chad', 'invoicing'),
+        'CL' => __('Chile', 'invoicing'),
+        'CN' => __('China', 'invoicing'),
+        'CX' => __('Christmas Island', 'invoicing'),
+        'CC' => __('Cocos Islands', 'invoicing'),
+        'CO' => __('Colombia', 'invoicing'),
+        'KM' => __('Comoros', 'invoicing'),
+        'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
+        'CG' => __('Congo, Republic of', 'invoicing'),
+        'CK' => __('Cook Islands', 'invoicing'),
+        'CR' => __('Costa Rica', 'invoicing'),
+        'CI' => __('Cote d\'Ivoire', 'invoicing'),
+        'HR' => __('Croatia/Hrvatska', 'invoicing'),
+        'CU' => __('Cuba', 'invoicing'),
+        'CW' => __('CuraÇao', 'invoicing'),
+        'CY' => __('Cyprus', 'invoicing'),
+        'CZ' => __('Czech Republic', 'invoicing'),
+        'DK' => __('Denmark', 'invoicing'),
+        'DJ' => __('Djibouti', 'invoicing'),
+        'DM' => __('Dominica', 'invoicing'),
+        'DO' => __('Dominican Republic', 'invoicing'),
+        'TP' => __('East Timor', 'invoicing'),
+        'EC' => __('Ecuador', 'invoicing'),
+        'EG' => __('Egypt', 'invoicing'),
+        'GQ' => __('Equatorial Guinea', 'invoicing'),
+        'SV' => __('El Salvador', 'invoicing'),
+        'ER' => __('Eritrea', 'invoicing'),
+        'EE' => __('Estonia', 'invoicing'),
+        'ET' => __('Ethiopia', 'invoicing'),
+        'FK' => __('Falkland Islands', 'invoicing'),
+        'FO' => __('Faroe Islands', 'invoicing'),
+        'FJ' => __('Fiji', 'invoicing'),
+        'FI' => __('Finland', 'invoicing'),
+        'FR' => __('France', 'invoicing'),
+        'GF' => __('French Guiana', 'invoicing'),
+        'PF' => __('French Polynesia', 'invoicing'),
+        'TF' => __('French Southern Territories', 'invoicing'),
+        'GA' => __('Gabon', 'invoicing'),
+        'GM' => __('Gambia', 'invoicing'),
+        'GE' => __('Georgia', 'invoicing'),
+        'DE' => __('Germany', 'invoicing'),
+        'GR' => __('Greece', 'invoicing'),
+        'GH' => __('Ghana', 'invoicing'),
+        'GI' => __('Gibraltar', 'invoicing'),
+        'GL' => __('Greenland', 'invoicing'),
+        'GD' => __('Grenada', 'invoicing'),
+        'GP' => __('Guadeloupe', 'invoicing'),
+        'GU' => __('Guam', 'invoicing'),
+        'GT' => __('Guatemala', 'invoicing'),
+        'GG' => __('Guernsey', 'invoicing'),
+        'GN' => __('Guinea', 'invoicing'),
+        'GW' => __('Guinea-Bissau', 'invoicing'),
+        'GY' => __('Guyana', 'invoicing'),
+        'HT' => __('Haiti', 'invoicing'),
+        'HM' => __('Heard and McDonald Islands', 'invoicing'),
+        'VA' => __('Holy See (City Vatican State)', 'invoicing'),
+        'HN' => __('Honduras', 'invoicing'),
+        'HK' => __('Hong Kong', 'invoicing'),
+        'HU' => __('Hungary', 'invoicing'),
+        'IS' => __('Iceland', 'invoicing'),
+        'IN' => __('India', 'invoicing'),
+        'ID' => __('Indonesia', 'invoicing'),
+        'IR' => __('Iran', 'invoicing'),
+        'IQ' => __('Iraq', 'invoicing'),
+        'IE' => __('Ireland', 'invoicing'),
+        'IM' => __('Isle of Man', 'invoicing'),
+        'IL' => __('Israel', 'invoicing'),
+        'IT' => __('Italy', 'invoicing'),
+        'JM' => __('Jamaica', 'invoicing'),
+        'JP' => __('Japan', 'invoicing'),
+        'JE' => __('Jersey', 'invoicing'),
+        'JO' => __('Jordan', 'invoicing'),
+        'KZ' => __('Kazakhstan', 'invoicing'),
+        'KE' => __('Kenya', 'invoicing'),
+        'KI' => __('Kiribati', 'invoicing'),
+        'KW' => __('Kuwait', 'invoicing'),
+        'KG' => __('Kyrgyzstan', 'invoicing'),
+        'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
+        'LV' => __('Latvia', 'invoicing'),
+        'LB' => __('Lebanon', 'invoicing'),
+        'LS' => __('Lesotho', 'invoicing'),
+        'LR' => __('Liberia', 'invoicing'),
+        'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
+        'LI' => __('Liechtenstein', 'invoicing'),
+        'LT' => __('Lithuania', 'invoicing'),
+        'LU' => __('Luxembourg', 'invoicing'),
+        'MO' => __('Macau', 'invoicing'),
+        'MK' => __('Macedonia', 'invoicing'),
+        'MG' => __('Madagascar', 'invoicing'),
+        'MW' => __('Malawi', 'invoicing'),
+        'MY' => __('Malaysia', 'invoicing'),
+        'MV' => __('Maldives', 'invoicing'),
+        'ML' => __('Mali', 'invoicing'),
+        'MT' => __('Malta', 'invoicing'),
+        'MH' => __('Marshall Islands', 'invoicing'),
+        'MQ' => __('Martinique', 'invoicing'),
+        'MR' => __('Mauritania', 'invoicing'),
+        'MU' => __('Mauritius', 'invoicing'),
+        'YT' => __('Mayotte', 'invoicing'),
+        'MX' => __('Mexico', 'invoicing'),
+        'FM' => __('Micronesia', 'invoicing'),
+        'MD' => __('Moldova, Republic of', 'invoicing'),
+        'MC' => __('Monaco', 'invoicing'),
+        'MN' => __('Mongolia', 'invoicing'),
+        'ME' => __('Montenegro', 'invoicing'),
+        'MS' => __('Montserrat', 'invoicing'),
+        'MA' => __('Morocco', 'invoicing'),
+        'MZ' => __('Mozambique', 'invoicing'),
+        'MM' => __('Myanmar', 'invoicing'),
+        'NA' => __('Namibia', 'invoicing'),
+        'NR' => __('Nauru', 'invoicing'),
+        'NP' => __('Nepal', 'invoicing'),
+        'NL' => __('Netherlands', 'invoicing'),
+        'AN' => __('Netherlands Antilles', 'invoicing'),
+        'NC' => __('New Caledonia', 'invoicing'),
+        'NZ' => __('New Zealand', 'invoicing'),
+        'NI' => __('Nicaragua', 'invoicing'),
+        'NE' => __('Niger', 'invoicing'),
+        'NG' => __('Nigeria', 'invoicing'),
+        'NU' => __('Niue', 'invoicing'),
+        'NF' => __('Norfolk Island', 'invoicing'),
+        'KP' => __('North Korea', 'invoicing'),
+        'MP' => __('Northern Mariana Islands', 'invoicing'),
+        'NO' => __('Norway', 'invoicing'),
+        'OM' => __('Oman', 'invoicing'),
+        'PK' => __('Pakistan', 'invoicing'),
+        'PW' => __('Palau', 'invoicing'),
+        'PS' => __('Palestinian Territories', 'invoicing'),
+        'PA' => __('Panama', 'invoicing'),
+        'PG' => __('Papua New Guinea', 'invoicing'),
+        'PY' => __('Paraguay', 'invoicing'),
+        'PE' => __('Peru', 'invoicing'),
+        'PH' => __('Phillipines', 'invoicing'),
+        'PN' => __('Pitcairn Island', 'invoicing'),
+        'PL' => __('Poland', 'invoicing'),
+        'PT' => __('Portugal', 'invoicing'),
+        'PR' => __('Puerto Rico', 'invoicing'),
+        'QA' => __('Qatar', 'invoicing'),
+        'XK' => __('Republic of Kosovo', 'invoicing'),
+        'RE' => __('Reunion Island', 'invoicing'),
+        'RO' => __('Romania', 'invoicing'),
+        'RU' => __('Russian Federation', 'invoicing'),
+        'RW' => __('Rwanda', 'invoicing'),
+        'BL' => __('Saint Barthélemy', 'invoicing'),
+        'SH' => __('Saint Helena', 'invoicing'),
+        'KN' => __('Saint Kitts and Nevis', 'invoicing'),
+        'LC' => __('Saint Lucia', 'invoicing'),
+        'MF' => __('Saint Martin (French)', 'invoicing'),
+        'SX' => __('Saint Martin (Dutch)', 'invoicing'),
+        'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
+        'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
+        'SM' => __('San Marino', 'invoicing'),
+        'ST' => __('São Tomé and Príncipe', 'invoicing'),
+        'SA' => __('Saudi Arabia', 'invoicing'),
+        'SN' => __('Senegal', 'invoicing'),
+        'RS' => __('Serbia', 'invoicing'),
+        'SC' => __('Seychelles', 'invoicing'),
+        'SL' => __('Sierra Leone', 'invoicing'),
+        'SG' => __('Singapore', 'invoicing'),
+        'SK' => __('Slovak Republic', 'invoicing'),
+        'SI' => __('Slovenia', 'invoicing'),
+        'SB' => __('Solomon Islands', 'invoicing'),
+        'SO' => __('Somalia', 'invoicing'),
+        'ZA' => __('South Africa', 'invoicing'),
+        'GS' => __('South Georgia', 'invoicing'),
+        'KR' => __('South Korea', 'invoicing'),
+        'SS' => __('South Sudan', 'invoicing'),
+        'ES' => __('Spain', 'invoicing'),
+        'LK' => __('Sri Lanka', 'invoicing'),
+        'SD' => __('Sudan', 'invoicing'),
+        'SR' => __('Suriname', 'invoicing'),
+        'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
+        'SZ' => __('Swaziland', 'invoicing'),
+        'SE' => __('Sweden', 'invoicing'),
+        'CH' => __('Switzerland', 'invoicing'),
+        'SY' => __('Syrian Arab Republic', 'invoicing'),
+        'TW' => __('Taiwan', 'invoicing'),
+        'TJ' => __('Tajikistan', 'invoicing'),
+        'TZ' => __('Tanzania', 'invoicing'),
+        'TH' => __('Thailand', 'invoicing'),
+        'TL' => __('Timor-Leste', 'invoicing'),
+        'TG' => __('Togo', 'invoicing'),
+        'TK' => __('Tokelau', 'invoicing'),
+        'TO' => __('Tonga', 'invoicing'),
+        'TT' => __('Trinidad and Tobago', 'invoicing'),
+        'TN' => __('Tunisia', 'invoicing'),
+        'TR' => __('Turkey', 'invoicing'),
+        'TM' => __('Turkmenistan', 'invoicing'),
+        'TC' => __('Turks and Caicos Islands', 'invoicing'),
+        'TV' => __('Tuvalu', 'invoicing'),
+        'UG' => __('Uganda', 'invoicing'),
+        'UA' => __('Ukraine', 'invoicing'),
+        'AE' => __('United Arab Emirates', 'invoicing'),
+        'UY' => __('Uruguay', 'invoicing'),
+        'UM' => __('US Minor Outlying Islands', 'invoicing'),
+        'UZ' => __('Uzbekistan', 'invoicing'),
+        'VU' => __('Vanuatu', 'invoicing'),
+        'VE' => __('Venezuela', 'invoicing'),
+        'VN' => __('Vietnam', 'invoicing'),
+        'VG' => __('Virgin Islands (British)', 'invoicing'),
+        'VI' => __('Virgin Islands (USA)', 'invoicing'),
+        'WF' => __('Wallis and Futuna Islands', 'invoicing'),
+        'EH' => __('Western Sahara', 'invoicing'),
+        'WS' => __('Western Samoa', 'invoicing'),
+        'YE' => __('Yemen', 'invoicing'),
+        'ZM' => __('Zambia', 'invoicing'),
+        'ZW' => __('Zimbabwe', 'invoicing'),
+    );
     
     if ( $first_empty ) {
         $countries = array_merge( array( '' => '' ), $countries );
@@ -1537,30 +1537,30 @@ 
 }
 
 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'] );
         
         $args = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => $sanitized_field_name . ' wpinv-select wpi_select2',
-			'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'   => $sanitized_field_name . ' wpinv-select wpi_select2',
+            '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 ) {
@@ -1581,14 +1581,14 @@ 
     $format = "{{address}} \n\n {{city}}, {{state}} \n\n {{country}} {{zip}}";
     
     /**
-	 * 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.
+     */
     return apply_filters( 'wpinv_get_full_address_format', $format );
 }
 
@@ -1634,13 +1634,13 @@ 
     }
     
     /**
-	 * 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.
-	 */
+     */
     return apply_filters( 'wpinv_get_invoice_address_replacements', $replacements, $billing_details );
 }
\ No newline at end of file