AyeCode / invoicing

includes/class-wpinv-addons.php

Braces +11 added lines, -12 removed lines

@@ -45,8 +45,7 @@ 
 
 		if($section_id=='recommended_plugins'){
 			$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
-		}
-		elseif ( ! empty( $section ) ) {
+		} elseif ( ! empty( $section ) ) {
 			if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
 			//if ( 1==1) {
 
@@ -119,14 +118,14 @@ 
 			$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'] : '';
-		}elseif( ($current_tab == 'addons' || $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
+		} elseif( ($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) {
+		} 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)){
@@ -139,7 +138,7 @@ 
 			if(is_object($addon->pricing)){
 				$prices = (Array)$addon->pricing;
 				$button_args['price'] = reset($prices);
-			}elseif(isset($addon->pricing)){
+			} elseif(isset($addon->pricing)){
 				$button_args['price'] = $addon->pricing;
 			}
 		}
@@ -160,7 +159,7 @@ 
 		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{
+			} else{
 				$button_args['active'] = self::is_theme_active($addon);
 			}
 		}
@@ -169,27 +168,27 @@ 
 		if($button_args['active']){
 			$button_args['button_text'] = __('Active','invoicing');
 			$button_args['class'] = ' button-secondary disabled ';
-		}elseif($button_args['installed']){
+		} 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{
+				} else{
 					$button_args['url'] = '#';
 				}
-			}else{
+			} else{
 				if ( current_user_can( 'switch_themes' ) ) {
 					$button_args['url'] = self::get_theme_activation_url($addon);
-				}else{
+				} else{
 					$button_args['url'] = '#';
 				}
 			}
 
-		}else{
+		} else{
 			if($button_args['type'] == 'recommended_plugins'){
 				$button_args['button_text'] = __('Install','invoicing');
-			}else{
+			} else{
 				$button_args['button_text'] = __('Get it','invoicing');
 
 				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){

Indentation +216 added lines, -216 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,85 +15,85 @@ 
 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 : array();
-		if ( 'addons' == $section_id ) {
-
-			$quotes = new stdClass();
-			$quotes->info = new stdClass();
-			$quotes->info->id = '';
-			$quotes->info->slug = 'invoicing-quotes';
-			$quotes->info->title = __( 'Quotes', 'invoicing' );
-			$quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
-			$quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
-			$quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
-
-			$products[] = $quotes;
-		}
+        );
+
+        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 : array();
+        if ( 'addons' == $section_id ) {
+
+            $quotes = new stdClass();
+            $quotes->info = new stdClass();
+            $quotes->info->id = '';
+            $quotes->info->slug = 'invoicing-quotes';
+            $quotes->info->title = __( 'Quotes', 'invoicing' );
+            $quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
+            $quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
+            $quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
+
+            $products[] = $quotes;
+        }
 		
-		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 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;
@@ -105,123 +105,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( 'invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ( $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'] : '';
-		}elseif( ($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";
-			}
-		}
-
-		// 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( 'invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ( $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'] : '';
+        }elseif( ($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";
+            }
+        }
+
+        // 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"
@@ -229,15 +229,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;?>"
@@ -260,33 +260,33 @@ 
 		<?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',
-				'name'   => 'Quotes',
-				'thumbnail'  => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
+                'name'   => 'Quotes',
+                'thumbnail'  => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
                 'desc'   => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.','invoicing'),
             ),
             'geodirectory' => array(
@@ -301,8 +301,8 @@ 
                 'name'   => 'UsersWP',
                 'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.','invoicing'),
             ),
-		);
+        );
 
-		return $plugins;
-	}
+        return $plugins;
+    }
 }

Spacing +90 added lines, -90 removed lines

@@ -5,7 +5,7 @@ 
  * All Invoicing extensions screen related functions can be found here.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,7 +20,7 @@ 
 	 *
 	 * @return array of tabs.
 	 */
-	public function get_tabs(){
+	public function get_tabs() {
 		$tabs = array(
 			'addons' => __("Addons", "invoicing"),
             'gateways' => __("Payment Gateways", "invoicing"),
@@ -38,28 +38,28 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_section_data( $section_id ) {
-		$section      = self::get_tab( $section_id );
+	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'){
+		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
+		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);
+				$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, ) );
+				$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 (!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 );
+					if (!empty($section_data->products)) {
+						set_transient('wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS);
 					}
 				}
 			}
@@ -67,21 +67,21 @@ 
 		}
 
 		$products = isset($section_data->products) ? $section_data->products : array();
-		if ( 'addons' == $section_id ) {
+		if ('addons' == $section_id) {
 
 			$quotes = new stdClass();
 			$quotes->info = new stdClass();
 			$quotes->info->id = '';
 			$quotes->info->slug = 'invoicing-quotes';
-			$quotes->info->title = __( 'Quotes', 'invoicing' );
-			$quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
+			$quotes->info->title = __('Quotes', 'invoicing');
+			$quotes->info->excerpt = __('Create quotes and estimates', 'invoicing');
 			$quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
 			$quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
 
 			$products[] = $quotes;
 		}
 		
-		return apply_filters( 'wpi_addons_section_data', $products, $section_id );
+		return apply_filters('wpi_addons_section_data', $products, $section_id);
 	}
 
 	/**
@@ -92,8 +92,8 @@ 
 	 * @param string $theme
 	 * @param string $plugin
 	 */
-	public function output_button( $addon ) {
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+	public function output_button($addon) {
+		$current_tab = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -105,14 +105,14 @@ 
 //		$install_status = 'get';
 //		$onclick = '';
 
-		$wp_org_themes = array('supreme-directory','directory-starter');
+		$wp_org_themes = array('supreme-directory', 'directory-starter');
 
 		$button_args = array(
-			'type' => ($current_tab == 'addons' || $current_tab =='gateways') ? 'addons' : $current_tab,
+			'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'),
+			'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',
@@ -128,83 +128,83 @@ 
 			'update_url' => '',
 		);
 
-		if( 'invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ( $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"=>""));
+		if ('invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ($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'] : '';
-		}elseif( ($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;}
+		}elseif (($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'];}
+			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;}
+		}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)){
+			if (!in_array($button_args['slug'], $wp_org_themes)) {
 				$button_args['update_url'] = "https://wpinvoicing.com";
 			}
 		}
 
 		// set price
-		if(isset($addon->pricing) && !empty($addon->pricing)){
-			if(is_object($addon->pricing)){
-				$prices = (Array)$addon->pricing;
+		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)){
+			}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']);
+		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'))){
+		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'){
+		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{
+			} else {
 				$button_args['active'] = self::is_theme_active($addon);
 			}
 		}
 
 		// set button text and class
-		if($button_args['active']){
-			$button_args['button_text'] = __('Active','invoicing');
+		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');
+		}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{
+			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' ) ) {
+			} else {
+				if (current_user_can('switch_themes')) {
 					$button_args['url'] = self::get_theme_activation_url($addon);
-				}else{
+				} 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');
+		} 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');
@@ -217,45 +217,45 @@ 
 
 		
 		// filter the button arguments
-		$button_args = apply_filters('edd_api_button_args',$button_args);
+		$button_args = apply_filters('edd_api_button_args', $button_args);
 //		print_r($button_args);
 		// set price text
-		if(isset($button_args['price_text'])){
+		if (isset($button_args['price_text'])) {
 			?>
 			<a
 				target="_blank"
 				class="addons-price-text"
-				href="<?php echo esc_url( $button_args['link'] ); ?>">
-				<?php echo esc_html( $button_args['price_text'] ); ?>
+				href="<?php echo esc_url($button_args['link']); ?>">
+				<?php echo esc_html($button_args['price_text']); ?>
 			</a>
 			<?php
 		}
 
 
 		$target = '';
-		if ( ! empty( $button_args['url'] ) ) {
+		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;?>"
-			data-title="<?php echo esc_attr($button_args['title']);?>"
-			data-type="<?php echo esc_attr($button_args['type']);?>"
-			data-text-error-message="<?php _e('Something went wrong!','invoicing');?>"
-			data-text-activate="<?php _e('Activate','invoicing');?>"
-			data-text-activating="<?php _e('Activating','invoicing');?>"
-			data-text-deactivate="<?php _e('Deactivate','invoicing');?>"
-			data-text-installed="<?php _e('Installed','invoicing');?>"
-			data-text-install="<?php _e('Install','invoicing');?>"
-			data-text-installing="<?php _e('Installing','invoicing');?>"
-			data-text-error="<?php _e('Error','invoicing');?>"
-			<?php if(!empty($button_args['onclick'])){echo " onclick='".$button_args['onclick']."' ";}?>
-			<?php echo $target;?>
-			class="addons-button  <?php echo esc_attr( $button_args['class'] ); ?>"
-			href="<?php echo esc_url( $button_args['url'] ); ?>">
-			<?php echo esc_html( $button_args['button_text'] ); ?>
+			data-licence="<?php echo esc_attr($button_args['license']); ?>"
+			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0; ?>"
+			data-title="<?php echo esc_attr($button_args['title']); ?>"
+			data-type="<?php echo esc_attr($button_args['type']); ?>"
+			data-text-error-message="<?php _e('Something went wrong!', 'invoicing'); ?>"
+			data-text-activate="<?php _e('Activate', 'invoicing'); ?>"
+			data-text-activating="<?php _e('Activating', 'invoicing'); ?>"
+			data-text-deactivate="<?php _e('Deactivate', 'invoicing'); ?>"
+			data-text-installed="<?php _e('Installed', 'invoicing'); ?>"
+			data-text-install="<?php _e('Install', 'invoicing'); ?>"
+			data-text-installing="<?php _e('Installing', 'invoicing'); ?>"
+			data-text-error="<?php _e('Error', 'invoicing'); ?>"
+			<?php if (!empty($button_args['onclick'])) {echo " onclick='" . $button_args['onclick'] . "' "; }?>
+			<?php echo $target; ?>
+			class="addons-button  <?php echo esc_attr($button_args['class']); ?>"
+			href="<?php echo esc_url($button_args['url']); ?>">
+			<?php echo esc_html($button_args['button_text']); ?>
 		</a>
 		<?php
 
@@ -270,36 +270,36 @@ 
 		$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' );
+		$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(){
+	public function get_recommend_wp_plugins() {
 		$plugins = array(
             'invoicing-quotes' => array(
                 'url'   => 'https://wordpress.org/plugins/invoicing-quotes/',
                 'slug'   => 'invoicing-quotes',
 				'name'   => 'Quotes',
 				'thumbnail'  => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
-                'desc'   => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.','invoicing'),
+                'desc'   => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.', 'invoicing'),
             ),
             'geodirectory' => array(
                 'url'   => 'https://wordpress.org/plugins/geodirectory/',
                 'slug'   => 'geodirectory',
                 'name'   => 'GeoDirectory',
-                'desc'   => __('Turn any WordPress theme into a global business directory portal.','invoicing'),
+                'desc'   => __('Turn any WordPress theme into a global business directory portal.', 'invoicing'),
             ),
             'userswp' => array(
                 'url'   => 'https://wordpress.org/plugins/userswp/',
                 'slug'   => 'userswp',
                 'name'   => 'UsersWP',
-                'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.','invoicing'),
+                'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.', 'invoicing'),
             ),
 		);
 

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

Indentation +863 added lines, -863 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,356 +21,356 @@ 
  */
 abstract class GetPaid_Data {
 
-	/**
-	 * ID for this object.
-	 *
-	 * @since 1.0.19
-	 * @var int
-	 */
-	protected $id = 0;
-
-	/**
-	 * Core data for this object. Name value pairs (name + default value).
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Core data changes for this object.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $changes = array();
-
-	/**
-	 * This is false until the object is read from the DB.
-	 *
-	 * @since 1.0.19
-	 * @var bool
-	 */
-	protected $object_read = false;
-
-	/**
-	 * This is the name of this object type.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	protected $object_type = 'data';
-
-	/**
-	 * Extra data for this object. Name value pairs (name + default value).
-	 * Used as a standard way for sub classes (like item types) to add
-	 * additional information to an inherited class.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $extra_data = array();
-
-	/**
-	 * Set to _data on construct so we can track and reset data if needed.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $default_data = array();
-
-	/**
-	 * Contains a reference to the data store for this class.
-	 *
-	 * @since 1.0.19
-	 * @var GetPaid_Data_Store
-	 */
-	protected $data_store;
-
-	/**
-	 * Stores meta in cache for future reads.
-	 * A group must be set to to enable caching.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	protected $cache_group = '';
-
-	/**
-	 * Stores the last error.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $last_error = '';
-
-	/**
-	 * Stores additional meta data.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $meta_data = null;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
-	 */
-	public function __construct( $read = 0 ) {
-		$this->data         = array_merge( $this->data, $this->extra_data );
-		$this->default_data = $this->data;
-	}
-
-	/**
-	 * Only store the object ID to avoid serializing the data object instance.
-	 *
-	 * @return array
-	 */
-	public function __sleep() {
-		return array( 'id' );
-	}
-
-	/**
-	 * Re-run the constructor with the object ID.
-	 *
-	 * If the object no longer exists, remove the ID.
-	 */
-	public function __wakeup() {
-		$this->__construct( absint( $this->id ) );
-
-		if ( ! empty( $this->last_error ) ) {
-			$this->set_id( 0 );
-		}
-
-	}
-
-	/**
-	 * When the object is cloned, make sure meta is duplicated correctly.
-	 *
-	 * @since 1.0.19
-	 */
-	public function __clone() {
-		$this->maybe_read_meta_data();
-		if ( ! empty( $this->meta_data ) ) {
-			foreach ( $this->meta_data as $array_key => $meta ) {
-				$this->meta_data[ $array_key ] = clone $meta;
-				if ( ! empty( $meta->id ) ) {
-					$this->meta_data[ $array_key ]->id = null;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the data store.
-	 *
-	 * @since  1.0.19
-	 * @return object
-	 */
-	public function get_data_store() {
-		return $this->data_store;
-	}
-
-	/**
-	 * Get the object type.
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	public function get_object_type() {
-		return $this->object_type;
-	}
-
-	/**
-	 * Returns the unique ID for this object.
-	 *
-	 * @since  1.0.19
-	 * @return int
-	 */
-	public function get_id() {
-		return $this->id;
-	}
-
-	/**
-	 * Get form status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
-    }
-
-	/**
-	 * Delete an object, set the ID to 0, and return result.
-	 *
-	 * @since  1.0.19
-	 * @param  bool $force_delete Should the data be deleted permanently.
-	 * @return bool result
-	 */
-	public function delete( $force_delete = false ) {
-		if ( $this->data_store && $this->exists() ) {
-			$this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
-			$this->set_id( 0 );
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Save should create or update based on object existence.
-	 *
-	 * @since  1.0.19
-	 * @return int
-	 */
-	public function save() {
-		if ( ! $this->data_store ) {
-			return $this->get_id();
-		}
-
-		/**
-		 * Trigger action before saving to the DB. Allows you to adjust object props before save.
-		 *
-		 * @param GetPaid_Data          $this The object being saved.
-		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
-		 */
-		do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
-
-		if ( $this->get_id() ) {
-			$this->data_store->update( $this );
-		} else {
-			$this->data_store->create( $this );
-		}
-
-		/**
-		 * Trigger action after saving to the DB.
-		 *
-		 * @param GetPaid_Data          $this The object being saved.
-		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
-		 */
-		do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
-
-		return $this->get_id();
-	}
-
-	/**
-	 * Change data to JSON format.
-	 *
-	 * @since  1.0.19
-	 * @return string Data in JSON format.
-	 */
-	public function __toString() {
-		return wp_json_encode( $this->get_data() );
-	}
-
-	/**
-	 * Returns all data for this object.
-	 *
-	 * @since  1.0.19
-	 * @return array
-	 */
-	public function get_data() {
-		return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
-	}
-
-	/**
-	 * Returns array of expected data keys for this object.
-	 *
-	 * @since   1.0.19
-	 * @return array
-	 */
-	public function get_data_keys() {
-		return array_keys( $this->data );
-	}
-
-	/**
-	 * Returns all "extra" data keys for an object (for sub objects like item types).
-	 *
-	 * @since  1.0.19
-	 * @return array
-	 */
-	public function get_extra_data_keys() {
-		return array_keys( $this->extra_data );
-	}
-
-	/**
-	 * Filter null meta values from array.
-	 *
-	 * @since  1.0.19
-	 * @param mixed $meta Meta value to check.
-	 * @return bool
-	 */
-	protected function filter_null_meta( $meta ) {
-		return ! is_null( $meta->value );
-	}
-
-	/**
-	 * Get All Meta Data.
-	 *
-	 * @since 1.0.19
-	 * @return array of objects.
-	 */
-	public function get_meta_data() {
-		$this->maybe_read_meta_data();
-		return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
-	}
-
-	/**
-	 * Check if the key is an internal one.
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Key to check.
-	 * @return bool   true if it's an internal key, false otherwise
-	 */
-	protected function is_internal_meta_key( $key ) {
-		$internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
-
-		if ( ! $internal_meta_key ) {
-			return false;
-		}
-
-		$has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
-
-		if ( ! $has_setter_or_getter ) {
-			return false;
-		}
-
-		/* translators: %s: $key Key to check */
-		getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
-
-		return true;
-	}
-
-	/**
-	 * Magic method for setting data fields.
-	 *
-	 * This method does not update custom fields in the database.
-	 *
-	 * @since 1.0.19
-	 * @access public
-	 *
-	 */
-	public function __set( $key, $value ) {
-
-		if ( 'id' == strtolower( $key ) ) {
-			return $this->set_id( $value );
-		}
-
-		if ( method_exists( $this, "set_$key") ) {
-
-			/* translators: %s: $key Key to set */
-			getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
-
-			call_user_func( array( $this, "set_$key" ), $value );
-		} else {
-			$this->set_prop( $key, $value );
-		}
-
-	}
-
-	/**
+    /**
+     * ID for this object.
+     *
+     * @since 1.0.19
+     * @var int
+     */
+    protected $id = 0;
+
+    /**
+     * Core data for this object. Name value pairs (name + default value).
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Core data changes for this object.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $changes = array();
+
+    /**
+     * This is false until the object is read from the DB.
+     *
+     * @since 1.0.19
+     * @var bool
+     */
+    protected $object_read = false;
+
+    /**
+     * This is the name of this object type.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    protected $object_type = 'data';
+
+    /**
+     * Extra data for this object. Name value pairs (name + default value).
+     * Used as a standard way for sub classes (like item types) to add
+     * additional information to an inherited class.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $extra_data = array();
+
+    /**
+     * Set to _data on construct so we can track and reset data if needed.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $default_data = array();
+
+    /**
+     * Contains a reference to the data store for this class.
+     *
+     * @since 1.0.19
+     * @var GetPaid_Data_Store
+     */
+    protected $data_store;
+
+    /**
+     * Stores meta in cache for future reads.
+     * A group must be set to to enable caching.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    protected $cache_group = '';
+
+    /**
+     * Stores the last error.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $last_error = '';
+
+    /**
+     * Stores additional meta data.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $meta_data = null;
+
+    /**
+     * Default constructor.
+     *
+     * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
+     */
+    public function __construct( $read = 0 ) {
+        $this->data         = array_merge( $this->data, $this->extra_data );
+        $this->default_data = $this->data;
+    }
+
+    /**
+     * Only store the object ID to avoid serializing the data object instance.
+     *
+     * @return array
+     */
+    public function __sleep() {
+        return array( 'id' );
+    }
+
+    /**
+     * Re-run the constructor with the object ID.
+     *
+     * If the object no longer exists, remove the ID.
+     */
+    public function __wakeup() {
+        $this->__construct( absint( $this->id ) );
+
+        if ( ! empty( $this->last_error ) ) {
+            $this->set_id( 0 );
+        }
+
+    }
+
+    /**
+     * When the object is cloned, make sure meta is duplicated correctly.
+     *
+     * @since 1.0.19
+     */
+    public function __clone() {
+        $this->maybe_read_meta_data();
+        if ( ! empty( $this->meta_data ) ) {
+            foreach ( $this->meta_data as $array_key => $meta ) {
+                $this->meta_data[ $array_key ] = clone $meta;
+                if ( ! empty( $meta->id ) ) {
+                    $this->meta_data[ $array_key ]->id = null;
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the data store.
+     *
+     * @since  1.0.19
+     * @return object
+     */
+    public function get_data_store() {
+        return $this->data_store;
+    }
+
+    /**
+     * Get the object type.
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    public function get_object_type() {
+        return $this->object_type;
+    }
+
+    /**
+     * Returns the unique ID for this object.
+     *
+     * @since  1.0.19
+     * @return int
+     */
+    public function get_id() {
+        return $this->id;
+    }
+
+    /**
+     * Get form status.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_status( $context = 'view' ) {
+        return $this->get_prop( 'status', $context );
+    }
+
+    /**
+     * Delete an object, set the ID to 0, and return result.
+     *
+     * @since  1.0.19
+     * @param  bool $force_delete Should the data be deleted permanently.
+     * @return bool result
+     */
+    public function delete( $force_delete = false ) {
+        if ( $this->data_store && $this->exists() ) {
+            $this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
+            $this->set_id( 0 );
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Save should create or update based on object existence.
+     *
+     * @since  1.0.19
+     * @return int
+     */
+    public function save() {
+        if ( ! $this->data_store ) {
+            return $this->get_id();
+        }
+
+        /**
+         * Trigger action before saving to the DB. Allows you to adjust object props before save.
+         *
+         * @param GetPaid_Data          $this The object being saved.
+         * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
+         */
+        do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+        if ( $this->get_id() ) {
+            $this->data_store->update( $this );
+        } else {
+            $this->data_store->create( $this );
+        }
+
+        /**
+         * Trigger action after saving to the DB.
+         *
+         * @param GetPaid_Data          $this The object being saved.
+         * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
+         */
+        do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+        return $this->get_id();
+    }
+
+    /**
+     * Change data to JSON format.
+     *
+     * @since  1.0.19
+     * @return string Data in JSON format.
+     */
+    public function __toString() {
+        return wp_json_encode( $this->get_data() );
+    }
+
+    /**
+     * Returns all data for this object.
+     *
+     * @since  1.0.19
+     * @return array
+     */
+    public function get_data() {
+        return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+    }
+
+    /**
+     * Returns array of expected data keys for this object.
+     *
+     * @since   1.0.19
+     * @return array
+     */
+    public function get_data_keys() {
+        return array_keys( $this->data );
+    }
+
+    /**
+     * Returns all "extra" data keys for an object (for sub objects like item types).
+     *
+     * @since  1.0.19
+     * @return array
+     */
+    public function get_extra_data_keys() {
+        return array_keys( $this->extra_data );
+    }
+
+    /**
+     * Filter null meta values from array.
+     *
+     * @since  1.0.19
+     * @param mixed $meta Meta value to check.
+     * @return bool
+     */
+    protected function filter_null_meta( $meta ) {
+        return ! is_null( $meta->value );
+    }
+
+    /**
+     * Get All Meta Data.
+     *
+     * @since 1.0.19
+     * @return array of objects.
+     */
+    public function get_meta_data() {
+        $this->maybe_read_meta_data();
+        return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
+    }
+
+    /**
+     * Check if the key is an internal one.
+     *
+     * @since  1.0.19
+     * @param  string $key Key to check.
+     * @return bool   true if it's an internal key, false otherwise
+     */
+    protected function is_internal_meta_key( $key ) {
+        $internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
+
+        if ( ! $internal_meta_key ) {
+            return false;
+        }
+
+        $has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
+
+        if ( ! $has_setter_or_getter ) {
+            return false;
+        }
+
+        /* translators: %s: $key Key to check */
+        getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+
+        return true;
+    }
+
+    /**
+     * Magic method for setting data fields.
+     *
+     * This method does not update custom fields in the database.
+     *
+     * @since 1.0.19
+     * @access public
+     *
+     */
+    public function __set( $key, $value ) {
+
+        if ( 'id' == strtolower( $key ) ) {
+            return $this->set_id( $value );
+        }
+
+        if ( method_exists( $this, "set_$key") ) {
+
+            /* translators: %s: $key Key to set */
+            getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+
+            call_user_func( array( $this, "set_$key" ), $value );
+        } else {
+            $this->set_prop( $key, $value );
+        }
+
+    }
+
+    /**
      * Margic method for retrieving a property.
      */
     public function __get( $key ) {
@@ -378,10 +378,10 @@ 
         // Check if we have a helper method for that.
         if ( method_exists( $this, 'get_' . $key ) ) {
 
-			if ( 'post_type' != $key ) {
-				/* translators: %s: $key Key to set */
-				getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
-			}
+            if ( 'post_type' != $key ) {
+                /* translators: %s: $key Key to set */
+                getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+            }
 
             return call_user_func( array( $this, 'get_' . $key ) );
         }
@@ -391,515 +391,515 @@ 
             return $this->post->$key;
         }
 
-		return $this->get_prop( $key );
-
-    }
-
-	/**
-	 * Get Meta Data by Key.
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Meta Key.
-	 * @param  bool   $single return first found meta with key, or all with $key.
-	 * @param  string $context What the value is for. Valid values are view and edit.
-	 * @return mixed
-	 */
-	public function get_meta( $key = '', $single = true, $context = 'view' ) {
-
-		// Check if this is an internal meta key.
-		$_key = str_replace( '_wpinv', '', $key );
-		$_key = str_replace( 'wpinv', '', $_key );
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'get_' . $_key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}();
-			}
-		}
-
-		// Read the meta data if not yet read.
-		$this->maybe_read_meta_data();
-		$meta_data  = $this->get_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
-		$value      = $single ? '' : array();
-
-		if ( ! empty( $array_keys ) ) {
-			// We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
-			if ( $single ) {
-				$value = $meta_data[ current( $array_keys ) ]->value;
-			} else {
-				$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
-			}
-		}
-
-		if ( 'view' === $context ) {
-			$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
-		}
-
-		return $value;
-	}
-
-	/**
-	 * See if meta data exists, since get_meta always returns a '' or array().
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Meta Key.
-	 * @return boolean
-	 */
-	public function meta_exists( $key = '' ) {
-		$this->maybe_read_meta_data();
-		$array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
-		return in_array( $key, $array_keys, true );
-	}
-
-	/**
-	 * Set all meta data from array.
-	 *
-	 * @since 1.0.19
-	 * @param array $data Key/Value pairs.
-	 */
-	public function set_meta_data( $data ) {
-		if ( ! empty( $data ) && is_array( $data ) ) {
-			$this->maybe_read_meta_data();
-			foreach ( $data as $meta ) {
-				$meta = (array) $meta;
-				if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
-					$this->meta_data[] = new GetPaid_Meta_Data(
-						array(
-							'id'    => $meta['id'],
-							'key'   => $meta['key'],
-							'value' => $meta['value'],
-						)
-					);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add meta data.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string       $key Meta key.
-	 * @param string|array $value Meta value.
-	 * @param bool         $unique Should this be a unique key?.
-	 */
-	public function add_meta_data( $key, $value, $unique = false ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'set_' . $key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
-			}
-		}
-
-		$this->maybe_read_meta_data();
-		if ( $unique ) {
-			$this->delete_meta_data( $key );
-		}
-		$this->meta_data[] = new GetPaid_Meta_Data(
-			array(
-				'key'   => $key,
-				'value' => $value,
-			)
-		);
-
-		$this->save();
-	}
-
-	/**
-	 * Update meta data by key or ID, if provided.
-	 *
-	 * @since  1.0.19
-	 *
-	 * @param  string       $key Meta key.
-	 * @param  string|array $value Meta value.
-	 * @param  int          $meta_id Meta ID.
-	 */
-	public function update_meta_data( $key, $value, $meta_id = 0 ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'set_' . $key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
-			}
-		}
-
-		$this->maybe_read_meta_data();
-
-		$array_key = false;
-
-		if ( $meta_id ) {
-			$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
-			$array_key  = $array_keys ? current( $array_keys ) : false;
-		} else {
-			// Find matches by key.
-			$matches = array();
-			foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
-				if ( $meta->key === $key ) {
-					$matches[] = $meta_data_array_key;
-				}
-			}
-
-			if ( ! empty( $matches ) ) {
-				// Set matches to null so only one key gets the new value.
-				foreach ( $matches as $meta_data_array_key ) {
-					$this->meta_data[ $meta_data_array_key ]->value = null;
-				}
-				$array_key = current( $matches );
-			}
-		}
-
-		if ( false !== $array_key ) {
-			$meta        = $this->meta_data[ $array_key ];
-			$meta->key   = $key;
-			$meta->value = $value;
-		} else {
-			$this->add_meta_data( $key, $value, true );
-		}
-	}
-
-	/**
-	 * Delete meta data.
-	 *
-	 * @since 1.0.19
-	 * @param string $key Meta key.
-	 */
-	public function delete_meta_data( $key ) {
-		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
-
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
-			}
-		}
-	}
-
-	/**
-	 * Delete meta data.
-	 *
-	 * @since 1.0.19
-	 * @param int $mid Meta ID.
-	 */
-	public function delete_meta_data_by_mid( $mid ) {
-		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
-
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
-			}
-		}
-	}
-
-	/**
-	 * Read meta data if null.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function maybe_read_meta_data() {
-		if ( is_null( $this->meta_data ) ) {
-			$this->read_meta_data();
-		}
-	}
-
-	/**
-	 * Read Meta Data from the database. Ignore any internal properties.
-	 * Uses it's own caches because get_metadata does not provide meta_ids.
-	 *
-	 * @since 1.0.19
-	 * @param bool $force_read True to force a new DB read (and update cache).
-	 */
-	public function read_meta_data( $force_read = false ) {
-
-		// Reset meta data.
-		$this->meta_data = array();
-
-		// Maybe abort early.
-		if ( ! $this->get_id() || ! $this->data_store ) {
-			return;
-		}
-
-		// Only read from cache if the cache key is set.
-		$cache_key = null;
-		if ( ! $force_read && ! empty( $this->cache_group ) ) {
-			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			$raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
-		}
-
-		// Should we force read?
-		if ( empty( $raw_meta_data ) ) {
-			$raw_meta_data = $this->data_store->read_meta( $this );
-
-			if ( ! empty( $cache_key ) ) {
-				wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
-			}
-
-		}
-
-		// Set meta data.
-		if ( is_array( $raw_meta_data ) ) {
-
-			foreach ( $raw_meta_data as $meta ) {
-				$this->meta_data[] = new GetPaid_Meta_Data(
-					array(
-						'id'    => (int) $meta->meta_id,
-						'key'   => $meta->meta_key,
-						'value' => maybe_unserialize( $meta->meta_value ),
-					)
-				);
-			}
-
-		}
-
-	}
-
-	/**
-	 * Update Meta Data in the database.
-	 *
-	 * @since 1.0.19
-	 */
-	public function save_meta_data() {
-		if ( ! $this->data_store || is_null( $this->meta_data ) ) {
-			return;
-		}
-		foreach ( $this->meta_data as $array_key => $meta ) {
-			if ( is_null( $meta->value ) ) {
-				if ( ! empty( $meta->id ) ) {
-					$this->data_store->delete_meta( $this, $meta );
-					unset( $this->meta_data[ $array_key ] );
-				}
-			} elseif ( empty( $meta->id ) ) {
-				$meta->id = $this->data_store->add_meta( $this, $meta );
-				$meta->apply_changes();
-			} else {
-				if ( $meta->get_changes() ) {
-					$this->data_store->update_meta( $this, $meta );
-					$meta->apply_changes();
-				}
-			}
-		}
-		if ( ! empty( $this->cache_group ) ) {
-			$cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			wp_cache_delete( $cache_key, $this->cache_group );
-		}
-	}
-
-	/**
-	 * Set ID.
-	 *
-	 * @since 1.0.19
-	 * @param int $id ID.
-	 */
-	public function set_id( $id ) {
-		$this->id = absint( $id );
-	}
-
-	/**
-	 * Sets item status.
-	 *
-	 * @since 1.0.19
-	 * @param string $status New status.
-	 * @return array details of change.
-	 */
-	public function set_status( $status ) {
+        return $this->get_prop( $key );
+
+    }
+
+    /**
+     * Get Meta Data by Key.
+     *
+     * @since  1.0.19
+     * @param  string $key Meta Key.
+     * @param  bool   $single return first found meta with key, or all with $key.
+     * @param  string $context What the value is for. Valid values are view and edit.
+     * @return mixed
+     */
+    public function get_meta( $key = '', $single = true, $context = 'view' ) {
+
+        // Check if this is an internal meta key.
+        $_key = str_replace( '_wpinv', '', $key );
+        $_key = str_replace( 'wpinv', '', $_key );
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'get_' . $_key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}();
+            }
+        }
+
+        // Read the meta data if not yet read.
+        $this->maybe_read_meta_data();
+        $meta_data  = $this->get_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
+        $value      = $single ? '' : array();
+
+        if ( ! empty( $array_keys ) ) {
+            // We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
+            if ( $single ) {
+                $value = $meta_data[ current( $array_keys ) ]->value;
+            } else {
+                $value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
+            }
+        }
+
+        if ( 'view' === $context ) {
+            $value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
+        }
+
+        return $value;
+    }
+
+    /**
+     * See if meta data exists, since get_meta always returns a '' or array().
+     *
+     * @since  1.0.19
+     * @param  string $key Meta Key.
+     * @return boolean
+     */
+    public function meta_exists( $key = '' ) {
+        $this->maybe_read_meta_data();
+        $array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
+        return in_array( $key, $array_keys, true );
+    }
+
+    /**
+     * Set all meta data from array.
+     *
+     * @since 1.0.19
+     * @param array $data Key/Value pairs.
+     */
+    public function set_meta_data( $data ) {
+        if ( ! empty( $data ) && is_array( $data ) ) {
+            $this->maybe_read_meta_data();
+            foreach ( $data as $meta ) {
+                $meta = (array) $meta;
+                if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
+                    $this->meta_data[] = new GetPaid_Meta_Data(
+                        array(
+                            'id'    => $meta['id'],
+                            'key'   => $meta['key'],
+                            'value' => $meta['value'],
+                        )
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Add meta data.
+     *
+     * @since 1.0.19
+     *
+     * @param string       $key Meta key.
+     * @param string|array $value Meta value.
+     * @param bool         $unique Should this be a unique key?.
+     */
+    public function add_meta_data( $key, $value, $unique = false ) {
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'set_' . $key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}( $value );
+            }
+        }
+
+        $this->maybe_read_meta_data();
+        if ( $unique ) {
+            $this->delete_meta_data( $key );
+        }
+        $this->meta_data[] = new GetPaid_Meta_Data(
+            array(
+                'key'   => $key,
+                'value' => $value,
+            )
+        );
+
+        $this->save();
+    }
+
+    /**
+     * Update meta data by key or ID, if provided.
+     *
+     * @since  1.0.19
+     *
+     * @param  string       $key Meta key.
+     * @param  string|array $value Meta value.
+     * @param  int          $meta_id Meta ID.
+     */
+    public function update_meta_data( $key, $value, $meta_id = 0 ) {
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'set_' . $key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}( $value );
+            }
+        }
+
+        $this->maybe_read_meta_data();
+
+        $array_key = false;
+
+        if ( $meta_id ) {
+            $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
+            $array_key  = $array_keys ? current( $array_keys ) : false;
+        } else {
+            // Find matches by key.
+            $matches = array();
+            foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
+                if ( $meta->key === $key ) {
+                    $matches[] = $meta_data_array_key;
+                }
+            }
+
+            if ( ! empty( $matches ) ) {
+                // Set matches to null so only one key gets the new value.
+                foreach ( $matches as $meta_data_array_key ) {
+                    $this->meta_data[ $meta_data_array_key ]->value = null;
+                }
+                $array_key = current( $matches );
+            }
+        }
+
+        if ( false !== $array_key ) {
+            $meta        = $this->meta_data[ $array_key ];
+            $meta->key   = $key;
+            $meta->value = $value;
+        } else {
+            $this->add_meta_data( $key, $value, true );
+        }
+    }
+
+    /**
+     * Delete meta data.
+     *
+     * @since 1.0.19
+     * @param string $key Meta key.
+     */
+    public function delete_meta_data( $key ) {
+        $this->maybe_read_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
+
+        if ( $array_keys ) {
+            foreach ( $array_keys as $array_key ) {
+                $this->meta_data[ $array_key ]->value = null;
+            }
+        }
+    }
+
+    /**
+     * Delete meta data.
+     *
+     * @since 1.0.19
+     * @param int $mid Meta ID.
+     */
+    public function delete_meta_data_by_mid( $mid ) {
+        $this->maybe_read_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
+
+        if ( $array_keys ) {
+            foreach ( $array_keys as $array_key ) {
+                $this->meta_data[ $array_key ]->value = null;
+            }
+        }
+    }
+
+    /**
+     * Read meta data if null.
+     *
+     * @since 1.0.19
+     */
+    protected function maybe_read_meta_data() {
+        if ( is_null( $this->meta_data ) ) {
+            $this->read_meta_data();
+        }
+    }
+
+    /**
+     * Read Meta Data from the database. Ignore any internal properties.
+     * Uses it's own caches because get_metadata does not provide meta_ids.
+     *
+     * @since 1.0.19
+     * @param bool $force_read True to force a new DB read (and update cache).
+     */
+    public function read_meta_data( $force_read = false ) {
+
+        // Reset meta data.
+        $this->meta_data = array();
+
+        // Maybe abort early.
+        if ( ! $this->get_id() || ! $this->data_store ) {
+            return;
+        }
+
+        // Only read from cache if the cache key is set.
+        $cache_key = null;
+        if ( ! $force_read && ! empty( $this->cache_group ) ) {
+            $cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
+            $raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
+        }
+
+        // Should we force read?
+        if ( empty( $raw_meta_data ) ) {
+            $raw_meta_data = $this->data_store->read_meta( $this );
+
+            if ( ! empty( $cache_key ) ) {
+                wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
+            }
+
+        }
+
+        // Set meta data.
+        if ( is_array( $raw_meta_data ) ) {
+
+            foreach ( $raw_meta_data as $meta ) {
+                $this->meta_data[] = new GetPaid_Meta_Data(
+                    array(
+                        'id'    => (int) $meta->meta_id,
+                        'key'   => $meta->meta_key,
+                        'value' => maybe_unserialize( $meta->meta_value ),
+                    )
+                );
+            }
+
+        }
+
+    }
+
+    /**
+     * Update Meta Data in the database.
+     *
+     * @since 1.0.19
+     */
+    public function save_meta_data() {
+        if ( ! $this->data_store || is_null( $this->meta_data ) ) {
+            return;
+        }
+        foreach ( $this->meta_data as $array_key => $meta ) {
+            if ( is_null( $meta->value ) ) {
+                if ( ! empty( $meta->id ) ) {
+                    $this->data_store->delete_meta( $this, $meta );
+                    unset( $this->meta_data[ $array_key ] );
+                }
+            } elseif ( empty( $meta->id ) ) {
+                $meta->id = $this->data_store->add_meta( $this, $meta );
+                $meta->apply_changes();
+            } else {
+                if ( $meta->get_changes() ) {
+                    $this->data_store->update_meta( $this, $meta );
+                    $meta->apply_changes();
+                }
+            }
+        }
+        if ( ! empty( $this->cache_group ) ) {
+            $cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
+            wp_cache_delete( $cache_key, $this->cache_group );
+        }
+    }
+
+    /**
+     * Set ID.
+     *
+     * @since 1.0.19
+     * @param int $id ID.
+     */
+    public function set_id( $id ) {
+        $this->id = absint( $id );
+    }
+
+    /**
+     * Sets item status.
+     *
+     * @since 1.0.19
+     * @param string $status New status.
+     * @return array details of change.
+     */
+    public function set_status( $status ) {
         $old_status = $this->get_status();
 
-		$this->set_prop( 'status', $status );
-
-		return array(
-			'from' => $old_status,
-			'to'   => $status,
-		);
-    }
-
-	/**
-	 * Set all props to default values.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_defaults() {
-		$this->data    = $this->default_data;
-		$this->changes = array();
-		$this->set_object_read( false );
-	}
-
-	/**
-	 * Set object read property.
-	 *
-	 * @since 1.0.19
-	 * @param boolean $read Should read?.
-	 */
-	public function set_object_read( $read = true ) {
-		$this->object_read = (bool) $read;
-	}
-
-	/**
-	 * Get object read property.
-	 *
-	 * @since  1.0.19
-	 * @return boolean
-	 */
-	public function get_object_read() {
-		return (bool) $this->object_read;
-	}
-
-	/**
-	 * Set a collection of props in one go, collect any errors, and return the result.
-	 * Only sets using public methods.
-	 *
-	 * @since  1.0.19
-	 *
-	 * @param array  $props Key value pairs to set. Key is the prop and should map to a setter function name.
-	 * @param string $context In what context to run this.
-	 *
-	 * @return bool|WP_Error
-	 */
-	public function set_props( $props, $context = 'set' ) {
-		$errors = false;
-
-		$props = wp_unslash( $props );
-		foreach ( $props as $prop => $value ) {
-			try {
-				/**
-				 * Checks if the prop being set is allowed, and the value is not null.
-				 */
-				if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
-					continue;
-				}
-				$setter = "set_$prop";
-
-				if ( is_callable( array( $this, $setter ) ) ) {
-					$this->{$setter}( $value );
-				}
-			} catch ( Exception $e ) {
-				if ( ! $errors ) {
-					$errors = new WP_Error();
-				}
-				$errors->add( $e->getCode(), $e->getMessage() );
-				$this->last_error = $e->getMessage();
-			}
-		}
-
-		return $errors && count( $errors->get_error_codes() ) ? $errors : true;
-	}
-
-	/**
-	 * Sets a prop for a setter method.
-	 *
-	 * This stores changes in a special array so we can track what needs saving
-	 * the the DB later.
-	 *
-	 * @since 1.0.19
-	 * @param string $prop Name of prop to set.
-	 * @param mixed  $value Value of the prop.
-	 */
-	protected function set_prop( $prop, $value ) {
-		if ( array_key_exists( $prop, $this->data ) ) {
-			if ( true === $this->object_read ) {
-				if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
-					$this->changes[ $prop ] = $value;
-				}
-			} else {
-				$this->data[ $prop ] = $value;
-			}
-		}
-	}
-
-	/**
-	 * Return data changes only.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_changes() {
-		return $this->changes;
-	}
-
-	/**
-	 * Merge changes with data and clear.
-	 *
-	 * @since 1.0.19
-	 */
-	public function apply_changes() {
-		$this->data    = array_replace( $this->data, $this->changes );
-		$this->changes = array();
-	}
-
-	/**
-	 * Prefix for action and filter hooks on data.
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	protected function get_hook_prefix() {
-		return 'wpinv_get_' . $this->object_type . '_';
-	}
-
-	/**
-	 * Gets a prop for a getter method.
-	 *
-	 * Gets the value from either current pending changes, or the data itself.
-	 * Context controls what happens to the value before it's returned.
-	 *
-	 * @since  1.0.19
-	 * @param  string $prop Name of prop to get.
-	 * @param  string $context What the value is for. Valid values are view and edit.
-	 * @return mixed
-	 */
-	protected function get_prop( $prop, $context = 'view' ) {
-		$value = null;
-
-		if ( array_key_exists( $prop, $this->data ) ) {
-			$value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
-
-			if ( 'view' === $context ) {
-				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
-			}
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Sets a date prop whilst handling formatting and datetime objects.
-	 *
-	 * @since 1.0.19
-	 * @param string         $prop Name of prop to set.
-	 * @param string|integer $value Value of the prop.
-	 */
-	protected function set_date_prop( $prop, $value ) {
-
-		if ( empty( $value ) ) {
-			$this->set_prop( $prop, null );
-			return;
-		}
-		$this->set_prop( $prop, $value );
-
-	}
-
-	/**
-	 * When invalid data is found, throw an exception unless reading from the DB.
-	 *
-	 * @since 1.0.19
-	 * @param string $code             Error code.
-	 * @param string $message          Error message.
-	 */
-	protected function error( $code, $message ) {
-		$this->last_error = $message;
-	}
-
-	/**
-	 * Checks if the object is saved in the database
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function exists() {
-		$id = $this->get_id();
-		return ! empty( $id );
-	}
+        $this->set_prop( 'status', $status );
+
+        return array(
+            'from' => $old_status,
+            'to'   => $status,
+        );
+    }
+
+    /**
+     * Set all props to default values.
+     *
+     * @since 1.0.19
+     */
+    public function set_defaults() {
+        $this->data    = $this->default_data;
+        $this->changes = array();
+        $this->set_object_read( false );
+    }
+
+    /**
+     * Set object read property.
+     *
+     * @since 1.0.19
+     * @param boolean $read Should read?.
+     */
+    public function set_object_read( $read = true ) {
+        $this->object_read = (bool) $read;
+    }
+
+    /**
+     * Get object read property.
+     *
+     * @since  1.0.19
+     * @return boolean
+     */
+    public function get_object_read() {
+        return (bool) $this->object_read;
+    }
+
+    /**
+     * Set a collection of props in one go, collect any errors, and return the result.
+     * Only sets using public methods.
+     *
+     * @since  1.0.19
+     *
+     * @param array  $props Key value pairs to set. Key is the prop and should map to a setter function name.
+     * @param string $context In what context to run this.
+     *
+     * @return bool|WP_Error
+     */
+    public function set_props( $props, $context = 'set' ) {
+        $errors = false;
+
+        $props = wp_unslash( $props );
+        foreach ( $props as $prop => $value ) {
+            try {
+                /**
+                 * Checks if the prop being set is allowed, and the value is not null.
+                 */
+                if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
+                    continue;
+                }
+                $setter = "set_$prop";
+
+                if ( is_callable( array( $this, $setter ) ) ) {
+                    $this->{$setter}( $value );
+                }
+            } catch ( Exception $e ) {
+                if ( ! $errors ) {
+                    $errors = new WP_Error();
+                }
+                $errors->add( $e->getCode(), $e->getMessage() );
+                $this->last_error = $e->getMessage();
+            }
+        }
+
+        return $errors && count( $errors->get_error_codes() ) ? $errors : true;
+    }
+
+    /**
+     * Sets a prop for a setter method.
+     *
+     * This stores changes in a special array so we can track what needs saving
+     * the the DB later.
+     *
+     * @since 1.0.19
+     * @param string $prop Name of prop to set.
+     * @param mixed  $value Value of the prop.
+     */
+    protected function set_prop( $prop, $value ) {
+        if ( array_key_exists( $prop, $this->data ) ) {
+            if ( true === $this->object_read ) {
+                if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
+                    $this->changes[ $prop ] = $value;
+                }
+            } else {
+                $this->data[ $prop ] = $value;
+            }
+        }
+    }
+
+    /**
+     * Return data changes only.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_changes() {
+        return $this->changes;
+    }
+
+    /**
+     * Merge changes with data and clear.
+     *
+     * @since 1.0.19
+     */
+    public function apply_changes() {
+        $this->data    = array_replace( $this->data, $this->changes );
+        $this->changes = array();
+    }
+
+    /**
+     * Prefix for action and filter hooks on data.
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    protected function get_hook_prefix() {
+        return 'wpinv_get_' . $this->object_type . '_';
+    }
+
+    /**
+     * Gets a prop for a getter method.
+     *
+     * Gets the value from either current pending changes, or the data itself.
+     * Context controls what happens to the value before it's returned.
+     *
+     * @since  1.0.19
+     * @param  string $prop Name of prop to get.
+     * @param  string $context What the value is for. Valid values are view and edit.
+     * @return mixed
+     */
+    protected function get_prop( $prop, $context = 'view' ) {
+        $value = null;
+
+        if ( array_key_exists( $prop, $this->data ) ) {
+            $value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
+
+            if ( 'view' === $context ) {
+                $value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Sets a date prop whilst handling formatting and datetime objects.
+     *
+     * @since 1.0.19
+     * @param string         $prop Name of prop to set.
+     * @param string|integer $value Value of the prop.
+     */
+    protected function set_date_prop( $prop, $value ) {
+
+        if ( empty( $value ) ) {
+            $this->set_prop( $prop, null );
+            return;
+        }
+        $this->set_prop( $prop, $value );
+
+    }
+
+    /**
+     * When invalid data is found, throw an exception unless reading from the DB.
+     *
+     * @since 1.0.19
+     * @param string $code             Error code.
+     * @param string $message          Error message.
+     */
+    protected function error( $code, $message ) {
+        $this->last_error = $message;
+    }
+
+    /**
+     * Checks if the object is saved in the database
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function exists() {
+        $id = $this->get_id();
+        return ! empty( $id );
+    }
 
 }

Spacing +162 added lines, -162 removed lines

@@ -8,7 +8,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -117,8 +117,8 @@ 
 	 *
 	 * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
 	 */
-	public function __construct( $read = 0 ) {
-		$this->data         = array_merge( $this->data, $this->extra_data );
+	public function __construct($read = 0) {
+		$this->data         = array_merge($this->data, $this->extra_data);
 		$this->default_data = $this->data;
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @return array
 	 */
 	public function __sleep() {
-		return array( 'id' );
+		return array('id');
 	}
 
 	/**
@@ -137,10 +137,10 @@ 
 	 * If the object no longer exists, remove the ID.
 	 */
 	public function __wakeup() {
-		$this->__construct( absint( $this->id ) );
+		$this->__construct(absint($this->id));
 
-		if ( ! empty( $this->last_error ) ) {
-			$this->set_id( 0 );
+		if (!empty($this->last_error)) {
+			$this->set_id(0);
 		}
 
 	}
@@ -152,11 +152,11 @@ 
 	 */
 	public function __clone() {
 		$this->maybe_read_meta_data();
-		if ( ! empty( $this->meta_data ) ) {
-			foreach ( $this->meta_data as $array_key => $meta ) {
-				$this->meta_data[ $array_key ] = clone $meta;
-				if ( ! empty( $meta->id ) ) {
-					$this->meta_data[ $array_key ]->id = null;
+		if (!empty($this->meta_data)) {
+			foreach ($this->meta_data as $array_key => $meta) {
+				$this->meta_data[$array_key] = clone $meta;
+				if (!empty($meta->id)) {
+					$this->meta_data[$array_key]->id = null;
 				}
 			}
 		}
@@ -199,8 +199,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+	public function get_status($context = 'view') {
+		return $this->get_prop('status', $context);
     }
 
 	/**
@@ -210,10 +210,10 @@ 
 	 * @param  bool $force_delete Should the data be deleted permanently.
 	 * @return bool result
 	 */
-	public function delete( $force_delete = false ) {
-		if ( $this->data_store && $this->exists() ) {
-			$this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
-			$this->set_id( 0 );
+	public function delete($force_delete = false) {
+		if ($this->data_store && $this->exists()) {
+			$this->data_store->delete($this, array('force_delete' => $force_delete));
+			$this->set_id(0);
 			return true;
 		}
 		return false;
@@ -226,7 +226,7 @@ 
 	 * @return int
 	 */
 	public function save() {
-		if ( ! $this->data_store ) {
+		if (!$this->data_store) {
 			return $this->get_id();
 		}
 
@@ -236,12 +236,12 @@ 
 		 * @param GetPaid_Data          $this The object being saved.
 		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
 		 */
-		do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+		do_action('getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store);
 
-		if ( $this->get_id() ) {
-			$this->data_store->update( $this );
+		if ($this->get_id()) {
+			$this->data_store->update($this);
 		} else {
-			$this->data_store->create( $this );
+			$this->data_store->create($this);
 		}
 
 		/**
@@ -250,7 +250,7 @@ 
 		 * @param GetPaid_Data          $this The object being saved.
 		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
 		 */
-		do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
+		do_action('getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store);
 
 		return $this->get_id();
 	}
@@ -262,7 +262,7 @@ 
 	 * @return string Data in JSON format.
 	 */
 	public function __toString() {
-		return wp_json_encode( $this->get_data() );
+		return wp_json_encode($this->get_data());
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 * @return array
 	 */
 	public function get_data() {
-		return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+		return array_merge(array('id' => $this->get_id()), $this->data, array('meta_data' => $this->get_meta_data()));
 	}
 
 	/**
@@ -282,7 +282,7 @@ 
 	 * @return array
 	 */
 	public function get_data_keys() {
-		return array_keys( $this->data );
+		return array_keys($this->data);
 	}
 
 	/**
@@ -292,7 +292,7 @@ 
 	 * @return array
 	 */
 	public function get_extra_data_keys() {
-		return array_keys( $this->extra_data );
+		return array_keys($this->extra_data);
 	}
 
 	/**
@@ -302,8 +302,8 @@ 
 	 * @param mixed $meta Meta value to check.
 	 * @return bool
 	 */
-	protected function filter_null_meta( $meta ) {
-		return ! is_null( $meta->value );
+	protected function filter_null_meta($meta) {
+		return !is_null($meta->value);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 */
 	public function get_meta_data() {
 		$this->maybe_read_meta_data();
-		return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
+		return array_values(array_filter($this->meta_data, array($this, 'filter_null_meta')));
 	}
 
 	/**
@@ -324,21 +324,21 @@ 
 	 * @param  string $key Key to check.
 	 * @return bool   true if it's an internal key, false otherwise
 	 */
-	protected function is_internal_meta_key( $key ) {
-		$internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
+	protected function is_internal_meta_key($key) {
+		$internal_meta_key = !empty($key) && $this->data_store && in_array($key, $this->data_store->get_internal_meta_keys(), true);
 
-		if ( ! $internal_meta_key ) {
+		if (!$internal_meta_key) {
 			return false;
 		}
 
-		$has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
+		$has_setter_or_getter = is_callable(array($this, 'set_' . $key)) || is_callable(array($this, 'get_' . $key));
 
-		if ( ! $has_setter_or_getter ) {
+		if (!$has_setter_or_getter) {
 			return false;
 		}
 
 		/* translators: %s: $key Key to check */
-		getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+		getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing'), $key), '1.0.19');
 
 		return true;
 	}
@@ -352,20 +352,20 @@ 
 	 * @access public
 	 *
 	 */
-	public function __set( $key, $value ) {
+	public function __set($key, $value) {
 
-		if ( 'id' == strtolower( $key ) ) {
-			return $this->set_id( $value );
+		if ('id' == strtolower($key)) {
+			return $this->set_id($value);
 		}
 
-		if ( method_exists( $this, "set_$key") ) {
+		if (method_exists($this, "set_$key")) {
 
 			/* translators: %s: $key Key to set */
-			getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+			getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing'), $key), '1.0.19');
 
-			call_user_func( array( $this, "set_$key" ), $value );
+			call_user_func(array($this, "set_$key"), $value);
 		} else {
-			$this->set_prop( $key, $value );
+			$this->set_prop($key, $value);
 		}
 
 	}
@@ -373,25 +373,25 @@ 
 	/**
      * Margic method for retrieving a property.
      */
-    public function __get( $key ) {
+    public function __get($key) {
 
         // Check if we have a helper method for that.
-        if ( method_exists( $this, 'get_' . $key ) ) {
+        if (method_exists($this, 'get_' . $key)) {
 
-			if ( 'post_type' != $key ) {
+			if ('post_type' != $key) {
 				/* translators: %s: $key Key to set */
-				getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+				getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing'), $key), '1.0.19');
 			}
 
-            return call_user_func( array( $this, 'get_' . $key ) );
+            return call_user_func(array($this, 'get_' . $key));
         }
 
         // Check if the key is in the associated $post object.
-        if ( ! empty( $this->post ) && isset( $this->post->$key ) ) {
+        if (!empty($this->post) && isset($this->post->$key)) {
             return $this->post->$key;
         }
 
-		return $this->get_prop( $key );
+		return $this->get_prop($key);
 
     }
 
@@ -404,15 +404,15 @@ 
 	 * @param  string $context What the value is for. Valid values are view and edit.
 	 * @return mixed
 	 */
-	public function get_meta( $key = '', $single = true, $context = 'view' ) {
+	public function get_meta($key = '', $single = true, $context = 'view') {
 
 		// Check if this is an internal meta key.
-		$_key = str_replace( '_wpinv', '', $key );
-		$_key = str_replace( 'wpinv', '', $_key );
-		if ( $this->is_internal_meta_key( $key ) ) {
+		$_key = str_replace('_wpinv', '', $key);
+		$_key = str_replace('wpinv', '', $_key);
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'get_' . $_key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
+			if (is_callable(array($this, $function))) {
 				return $this->{$function}();
 			}
 		}
@@ -420,20 +420,20 @@ 
 		// Read the meta data if not yet read.
 		$this->maybe_read_meta_data();
 		$meta_data  = $this->get_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
+		$array_keys = array_keys(wp_list_pluck($meta_data, 'key'), $key, true);
 		$value      = $single ? '' : array();
 
-		if ( ! empty( $array_keys ) ) {
+		if (!empty($array_keys)) {
 			// We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
-			if ( $single ) {
-				$value = $meta_data[ current( $array_keys ) ]->value;
+			if ($single) {
+				$value = $meta_data[current($array_keys)]->value;
 			} else {
-				$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
+				$value = array_intersect_key($meta_data, array_flip($array_keys));
 			}
 		}
 
-		if ( 'view' === $context ) {
-			$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
+		if ('view' === $context) {
+			$value = apply_filters($this->get_hook_prefix() . $key, $value, $this);
 		}
 
 		return $value;
@@ -446,10 +446,10 @@ 
 	 * @param  string $key Meta Key.
 	 * @return boolean
 	 */
-	public function meta_exists( $key = '' ) {
+	public function meta_exists($key = '') {
 		$this->maybe_read_meta_data();
-		$array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
-		return in_array( $key, $array_keys, true );
+		$array_keys = wp_list_pluck($this->get_meta_data(), 'key');
+		return in_array($key, $array_keys, true);
 	}
 
 	/**
@@ -458,12 +458,12 @@ 
 	 * @since 1.0.19
 	 * @param array $data Key/Value pairs.
 	 */
-	public function set_meta_data( $data ) {
-		if ( ! empty( $data ) && is_array( $data ) ) {
+	public function set_meta_data($data) {
+		if (!empty($data) && is_array($data)) {
 			$this->maybe_read_meta_data();
-			foreach ( $data as $meta ) {
+			foreach ($data as $meta) {
 				$meta = (array) $meta;
-				if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
+				if (isset($meta['key'], $meta['value'], $meta['id'])) {
 					$this->meta_data[] = new GetPaid_Meta_Data(
 						array(
 							'id'    => $meta['id'],
@@ -485,18 +485,18 @@ 
 	 * @param string|array $value Meta value.
 	 * @param bool         $unique Should this be a unique key?.
 	 */
-	public function add_meta_data( $key, $value, $unique = false ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
+	public function add_meta_data($key, $value, $unique = false) {
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'set_' . $key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
+			if (is_callable(array($this, $function))) {
+				return $this->{$function}($value);
 			}
 		}
 
 		$this->maybe_read_meta_data();
-		if ( $unique ) {
-			$this->delete_meta_data( $key );
+		if ($unique) {
+			$this->delete_meta_data($key);
 		}
 		$this->meta_data[] = new GetPaid_Meta_Data(
 			array(
@@ -517,12 +517,12 @@ 
 	 * @param  string|array $value Meta value.
 	 * @param  int          $meta_id Meta ID.
 	 */
-	public function update_meta_data( $key, $value, $meta_id = 0 ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
+	public function update_meta_data($key, $value, $meta_id = 0) {
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'set_' . $key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
+			if (is_callable(array($this, $function))) {
+				return $this->{$function}($value);
 			}
 		}
 
@@ -530,33 +530,33 @@ 
 
 		$array_key = false;
 
-		if ( $meta_id ) {
-			$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
-			$array_key  = $array_keys ? current( $array_keys ) : false;
+		if ($meta_id) {
+			$array_keys = array_keys(wp_list_pluck($this->meta_data, 'id'), $meta_id, true);
+			$array_key  = $array_keys ? current($array_keys) : false;
 		} else {
 			// Find matches by key.
 			$matches = array();
-			foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
-				if ( $meta->key === $key ) {
+			foreach ($this->meta_data as $meta_data_array_key => $meta) {
+				if ($meta->key === $key) {
 					$matches[] = $meta_data_array_key;
 				}
 			}
 
-			if ( ! empty( $matches ) ) {
+			if (!empty($matches)) {
 				// Set matches to null so only one key gets the new value.
-				foreach ( $matches as $meta_data_array_key ) {
-					$this->meta_data[ $meta_data_array_key ]->value = null;
+				foreach ($matches as $meta_data_array_key) {
+					$this->meta_data[$meta_data_array_key]->value = null;
 				}
-				$array_key = current( $matches );
+				$array_key = current($matches);
 			}
 		}
 
-		if ( false !== $array_key ) {
-			$meta        = $this->meta_data[ $array_key ];
+		if (false !== $array_key) {
+			$meta        = $this->meta_data[$array_key];
 			$meta->key   = $key;
 			$meta->value = $value;
 		} else {
-			$this->add_meta_data( $key, $value, true );
+			$this->add_meta_data($key, $value, true);
 		}
 	}
 
@@ -566,13 +566,13 @@ 
 	 * @since 1.0.19
 	 * @param string $key Meta key.
 	 */
-	public function delete_meta_data( $key ) {
+	public function delete_meta_data($key) {
 		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
+		$array_keys = array_keys(wp_list_pluck($this->meta_data, 'key'), $key, true);
 
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
+		if ($array_keys) {
+			foreach ($array_keys as $array_key) {
+				$this->meta_data[$array_key]->value = null;
 			}
 		}
 	}
@@ -583,13 +583,13 @@ 
 	 * @since 1.0.19
 	 * @param int $mid Meta ID.
 	 */
-	public function delete_meta_data_by_mid( $mid ) {
+	public function delete_meta_data_by_mid($mid) {
 		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
+		$array_keys = array_keys(wp_list_pluck($this->meta_data, 'id'), (int) $mid, true);
 
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
+		if ($array_keys) {
+			foreach ($array_keys as $array_key) {
+				$this->meta_data[$array_key]->value = null;
 			}
 		}
 	}
@@ -600,7 +600,7 @@ 
 	 * @since 1.0.19
 	 */
 	protected function maybe_read_meta_data() {
-		if ( is_null( $this->meta_data ) ) {
+		if (is_null($this->meta_data)) {
 			$this->read_meta_data();
 		}
 	}
@@ -612,42 +612,42 @@ 
 	 * @since 1.0.19
 	 * @param bool $force_read True to force a new DB read (and update cache).
 	 */
-	public function read_meta_data( $force_read = false ) {
+	public function read_meta_data($force_read = false) {
 
 		// Reset meta data.
 		$this->meta_data = array();
 
 		// Maybe abort early.
-		if ( ! $this->get_id() || ! $this->data_store ) {
+		if (!$this->get_id() || !$this->data_store) {
 			return;
 		}
 
 		// Only read from cache if the cache key is set.
 		$cache_key = null;
-		if ( ! $force_read && ! empty( $this->cache_group ) ) {
-			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			$raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
+		if (!$force_read && !empty($this->cache_group)) {
+			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix($this->cache_group) . GetPaid_Cache_Helper::get_cache_prefix('object_' . $this->get_id()) . 'object_meta_' . $this->get_id();
+			$raw_meta_data = wp_cache_get($cache_key, $this->cache_group);
 		}
 
 		// Should we force read?
-		if ( empty( $raw_meta_data ) ) {
-			$raw_meta_data = $this->data_store->read_meta( $this );
+		if (empty($raw_meta_data)) {
+			$raw_meta_data = $this->data_store->read_meta($this);
 
-			if ( ! empty( $cache_key ) ) {
-				wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
+			if (!empty($cache_key)) {
+				wp_cache_set($cache_key, $raw_meta_data, $this->cache_group);
 			}
 
 		}
 
 		// Set meta data.
-		if ( is_array( $raw_meta_data ) ) {
+		if (is_array($raw_meta_data)) {
 
-			foreach ( $raw_meta_data as $meta ) {
+			foreach ($raw_meta_data as $meta) {
 				$this->meta_data[] = new GetPaid_Meta_Data(
 					array(
 						'id'    => (int) $meta->meta_id,
 						'key'   => $meta->meta_key,
-						'value' => maybe_unserialize( $meta->meta_value ),
+						'value' => maybe_unserialize($meta->meta_value),
 					)
 				);
 			}
@@ -662,28 +662,28 @@ 
 	 * @since 1.0.19
 	 */
 	public function save_meta_data() {
-		if ( ! $this->data_store || is_null( $this->meta_data ) ) {
+		if (!$this->data_store || is_null($this->meta_data)) {
 			return;
 		}
-		foreach ( $this->meta_data as $array_key => $meta ) {
-			if ( is_null( $meta->value ) ) {
-				if ( ! empty( $meta->id ) ) {
-					$this->data_store->delete_meta( $this, $meta );
-					unset( $this->meta_data[ $array_key ] );
+		foreach ($this->meta_data as $array_key => $meta) {
+			if (is_null($meta->value)) {
+				if (!empty($meta->id)) {
+					$this->data_store->delete_meta($this, $meta);
+					unset($this->meta_data[$array_key]);
 				}
-			} elseif ( empty( $meta->id ) ) {
-				$meta->id = $this->data_store->add_meta( $this, $meta );
+			} elseif (empty($meta->id)) {
+				$meta->id = $this->data_store->add_meta($this, $meta);
 				$meta->apply_changes();
 			} else {
-				if ( $meta->get_changes() ) {
-					$this->data_store->update_meta( $this, $meta );
+				if ($meta->get_changes()) {
+					$this->data_store->update_meta($this, $meta);
 					$meta->apply_changes();
 				}
 			}
 		}
-		if ( ! empty( $this->cache_group ) ) {
-			$cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			wp_cache_delete( $cache_key, $this->cache_group );
+		if (!empty($this->cache_group)) {
+			$cache_key = GetPaid_Cache_Helper::get_cache_prefix($this->cache_group) . GetPaid_Cache_Helper::get_cache_prefix('object_' . $this->get_id()) . 'object_meta_' . $this->get_id();
+			wp_cache_delete($cache_key, $this->cache_group);
 		}
 	}
 
@@ -693,8 +693,8 @@ 
 	 * @since 1.0.19
 	 * @param int $id ID.
 	 */
-	public function set_id( $id ) {
-		$this->id = absint( $id );
+	public function set_id($id) {
+		$this->id = absint($id);
 	}
 
 	/**
@@ -704,10 +704,10 @@ 
 	 * @param string $status New status.
 	 * @return array details of change.
 	 */
-	public function set_status( $status ) {
+	public function set_status($status) {
         $old_status = $this->get_status();
 
-		$this->set_prop( 'status', $status );
+		$this->set_prop('status', $status);
 
 		return array(
 			'from' => $old_status,
@@ -723,7 +723,7 @@ 
 	public function set_defaults() {
 		$this->data    = $this->default_data;
 		$this->changes = array();
-		$this->set_object_read( false );
+		$this->set_object_read(false);
 	}
 
 	/**
@@ -732,7 +732,7 @@ 
 	 * @since 1.0.19
 	 * @param boolean $read Should read?.
 	 */
-	public function set_object_read( $read = true ) {
+	public function set_object_read($read = true) {
 		$this->object_read = (bool) $read;
 	}
 
@@ -757,33 +757,33 @@ 
 	 *
 	 * @return bool|WP_Error
 	 */
-	public function set_props( $props, $context = 'set' ) {
+	public function set_props($props, $context = 'set') {
 		$errors = false;
 
-		$props = wp_unslash( $props );
-		foreach ( $props as $prop => $value ) {
+		$props = wp_unslash($props);
+		foreach ($props as $prop => $value) {
 			try {
 				/**
 				 * Checks if the prop being set is allowed, and the value is not null.
 				 */
-				if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
+				if (is_null($value) || in_array($prop, array('prop', 'date_prop', 'meta_data'), true)) {
 					continue;
 				}
 				$setter = "set_$prop";
 
-				if ( is_callable( array( $this, $setter ) ) ) {
-					$this->{$setter}( $value );
+				if (is_callable(array($this, $setter))) {
+					$this->{$setter}($value);
 				}
-			} catch ( Exception $e ) {
-				if ( ! $errors ) {
+			} catch (Exception $e) {
+				if (!$errors) {
 					$errors = new WP_Error();
 				}
-				$errors->add( $e->getCode(), $e->getMessage() );
+				$errors->add($e->getCode(), $e->getMessage());
 				$this->last_error = $e->getMessage();
 			}
 		}
 
-		return $errors && count( $errors->get_error_codes() ) ? $errors : true;
+		return $errors && count($errors->get_error_codes()) ? $errors : true;
 	}
 
 	/**
@@ -796,14 +796,14 @@ 
 	 * @param string $prop Name of prop to set.
 	 * @param mixed  $value Value of the prop.
 	 */
-	protected function set_prop( $prop, $value ) {
-		if ( array_key_exists( $prop, $this->data ) ) {
-			if ( true === $this->object_read ) {
-				if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
-					$this->changes[ $prop ] = $value;
+	protected function set_prop($prop, $value) {
+		if (array_key_exists($prop, $this->data)) {
+			if (true === $this->object_read) {
+				if ($value !== $this->data[$prop] || array_key_exists($prop, $this->changes)) {
+					$this->changes[$prop] = $value;
 				}
 			} else {
-				$this->data[ $prop ] = $value;
+				$this->data[$prop] = $value;
 			}
 		}
 	}
@@ -824,7 +824,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function apply_changes() {
-		$this->data    = array_replace( $this->data, $this->changes );
+		$this->data    = array_replace($this->data, $this->changes);
 		$this->changes = array();
 	}
 
@@ -849,14 +849,14 @@ 
 	 * @param  string $context What the value is for. Valid values are view and edit.
 	 * @return mixed
 	 */
-	protected function get_prop( $prop, $context = 'view' ) {
+	protected function get_prop($prop, $context = 'view') {
 		$value = null;
 
-		if ( array_key_exists( $prop, $this->data ) ) {
-			$value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
+		if (array_key_exists($prop, $this->data)) {
+			$value = array_key_exists($prop, $this->changes) ? $this->changes[$prop] : $this->data[$prop];
 
-			if ( 'view' === $context ) {
-				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+			if ('view' === $context) {
+				$value = apply_filters($this->get_hook_prefix() . $prop, $value, $this);
 			}
 		}
 
@@ -870,13 +870,13 @@ 
 	 * @param string         $prop Name of prop to set.
 	 * @param string|integer $value Value of the prop.
 	 */
-	protected function set_date_prop( $prop, $value ) {
+	protected function set_date_prop($prop, $value) {
 
-		if ( empty( $value ) ) {
-			$this->set_prop( $prop, null );
+		if (empty($value)) {
+			$this->set_prop($prop, null);
 			return;
 		}
-		$this->set_prop( $prop, $value );
+		$this->set_prop($prop, $value);
 
 	}
 
@@ -887,7 +887,7 @@ 
 	 * @param string $code             Error code.
 	 * @param string $message          Error message.
 	 */
-	protected function error( $code, $message ) {
+	protected function error($code, $message) {
 		$this->last_error = $message;
 	}
 
@@ -899,7 +899,7 @@ 
 	 */
 	public function exists() {
 		$id = $this->get_id();
-		return ! empty( $id );
+		return !empty($id);
 	}
 
 }

includes/data/admin-settings.php

Spacing +170 added lines, -170 removed lines

@@ -8,99 +8,99 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $getpaid_pages = GetPaid_Installer::get_pages();
-$pages         = wpinv_get_pages( true );
+$pages         = wpinv_get_pages(true);
     
 $currencies = wpinv_get_currencies();
     
 $currency_code_options = array();
-foreach ( $currencies as $code => $name ) {
-    $currency_code_options[ $code ] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol( $code ) . ')';
+foreach ($currencies as $code => $name) {
+    $currency_code_options[$code] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol($code) . ')';
 }
 
 $invoice_number_padd_options = array();
-for ( $i = 0; $i <= 20; $i++ ) {
+for ($i = 0; $i <= 20; $i++) {
     $invoice_number_padd_options[$i] = $i;
 }
     
 $currency_symbol = wpinv_currency_symbol();
     
 $last_number = $reset_number = '';
-if ( $last_invoice_number = get_option( 'wpinv_last_invoice_number' ) ) {
-    $last_invoice_number = preg_replace( '/[^0-9]/', '', $last_invoice_number );
+if ($last_invoice_number = get_option('wpinv_last_invoice_number')) {
+    $last_invoice_number = preg_replace('/[^0-9]/', '', $last_invoice_number);
 
-    if ( !empty( $last_invoice_number ) ) {
-        $last_number = ' ' . wp_sprintf( __( "( Last Invoice's sequential number: <b>%s</b> )", 'invoicing' ), $last_invoice_number );
+    if (!empty($last_invoice_number)) {
+        $last_number = ' ' . wp_sprintf(__("( Last Invoice's sequential number: <b>%s</b> )", 'invoicing'), $last_invoice_number);
     }
 
     $nonce = wp_create_nonce('reset_invoice_count');
-    $reset_number = '<a href="'.add_query_arg(array('reset_invoice_count' => 1, '_nonce' => $nonce)).'" class="btn button">'.__('Force Reset Sequence', 'invoicing' ). '</a>';
+    $reset_number = '<a href="' . add_query_arg(array('reset_invoice_count' => 1, '_nonce' => $nonce)) . '" class="btn button">' . __('Force Reset Sequence', 'invoicing') . '</a>';
 }
     
 $alert_wrapper_start = '<p style="color: #F00">';
 $alert_wrapper_close = '</p>';
 
 return array(
-    'general' => apply_filters( 'wpinv_settings_general',
+    'general' => apply_filters('wpinv_settings_general',
         array(
             'main' => array(
                 'location_settings' => array(
                     'id'   => 'location_settings',
-                    'name' => '<h3>' . __( 'Default Location', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Default Location', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'default_country' => array(
                     'id'      => 'default_country',
-                    'name'    => __( 'Default Country', 'invoicing' ),
-                    'desc'    => __( 'Where does your store operate from?', 'invoicing' ),
+                    'name'    => __('Default Country', 'invoicing'),
+                    'desc'    => __('Where does your store operate from?', 'invoicing'),
                     'type'    => 'select',
                     'options' => wpinv_get_country_list(),
                     'std'     => 'GB',
                     'class'   => 'wpi_select2',
-                    'placeholder' => __( 'Select a country', 'invoicing' ),
+                    'placeholder' => __('Select a country', 'invoicing'),
                 ),
                 'default_state' => array(
                     'id'      => 'default_state',
-                    'name'    => __( 'Default State / Province', 'invoicing' ),
-                    'desc'    => __( 'What state / province does your store operate from?', 'invoicing' ),
+                    'name'    => __('Default State / Province', 'invoicing'),
+                    'desc'    => __('What state / province does your store operate from?', 'invoicing'),
                     'type'    => 'country_states',
                     'class'   => 'wpi_select2',
-                    'placeholder' => __( 'Select a state', 'invoicing' ),
+                    'placeholder' => __('Select a state', 'invoicing'),
                 ),
                 'store_name' => array(
                     'id'   => 'store_name',
-                    'name' => __( 'Store Name', 'invoicing' ),
-                    'desc' => __( 'Store name to print on invoices.', 'invoicing' ),
+                    'name' => __('Store Name', 'invoicing'),
+                    'desc' => __('Store name to print on invoices.', 'invoicing'),
                     'std'     => get_option('blogname'),
                     'type' => 'text',
                 ),
                 'logo' => array(
                     'id'   => 'logo',
-                    'name' => __( 'Logo URL', 'invoicing' ),
-                    'desc' => __( 'Store logo to print on invoices.', 'invoicing' ),
+                    'name' => __('Logo URL', 'invoicing'),
+                    'desc' => __('Store logo to print on invoices.', 'invoicing'),
                     'type' => 'text',
                 ),
                 'logo_width'      => array(
                     'id'          => 'logo_width',
-                    'name'        => __( 'Logo width', 'invoicing' ),
-                    'desc'        => __( 'Logo width to use in invoice image.', 'invoicing' ),
+                    'name'        => __('Logo width', 'invoicing'),
+                    'desc'        => __('Logo width to use in invoice image.', 'invoicing'),
                     'type'        => 'number',
-                    'placeholder' => __( 'Auto', 'invoicing' ),
+                    'placeholder' => __('Auto', 'invoicing'),
                 ),
                 'logo_height'     => array(
                     'id'          => 'logo_height',
-                    'name'        => __( 'Logo height', 'invoicing' ),
-                    'desc'        => __( 'Logo height to use in invoice image.', 'invoicing' ),
+                    'name'        => __('Logo height', 'invoicing'),
+                    'desc'        => __('Logo height to use in invoice image.', 'invoicing'),
                     'type'        => 'number',
-                    'placeholder' => __( 'Auto', 'invoicing' ),
+                    'placeholder' => __('Auto', 'invoicing'),
                 ),
                 'store_address' => array(
                     'id'   => 'store_address',
-                    'name' => __( 'Store Address', 'invoicing' ),
-                    'desc' => __( 'Enter the store address to display on invoice', 'invoicing' ),
+                    'name' => __('Store Address', 'invoicing'),
+                    'desc' => __('Enter the store address to display on invoice', 'invoicing'),
                     'type' => 'textarea',
                 ),
 
@@ -108,114 +108,114 @@ 
             'page_section' => array(
                 'page_settings' => array(
                     'id'   => 'page_settings',
-                    'name' => '<h3>' . __( 'Page Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Page Settings', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'checkout_page' => array(
                     'id'          => 'checkout_page',
-                    'name'        => __( 'Checkout Page', 'invoicing' ),
-                    'desc'        => __( 'This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing' ),
+                    'name'        => __('Checkout Page', 'invoicing'),
+                    'desc'        => __('This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['checkout_page'] ) ? '' : $getpaid_pages['checkout_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['checkout_page']) ? '' : $getpaid_pages['checkout_page']['content'],
                     'help-tip'    => true,
                 ),
                 'success_page' => array(
                     'id'          => 'success_page',
-                    'name'        => __( 'Success Page', 'invoicing' ),
-                    'desc'        => __( 'This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing' ),
+                    'name'        => __('Success Page', 'invoicing'),
+                    'desc'        => __('This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['success_page'] ) ? '' : $getpaid_pages['success_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['success_page']) ? '' : $getpaid_pages['success_page']['content'],
                     'help-tip'    => true,
                 ),
                 'failure_page' => array(
                     'id'          => 'failure_page',
-                    'name'        => __( 'Failed Transaction Page', 'invoicing' ),
-                    'desc'        => __( 'This is the page buyers are sent to if their transaction is cancelled or fails.', 'invoicing' ),
+                    'name'        => __('Failed Transaction Page', 'invoicing'),
+                    'desc'        => __('This is the page buyers are sent to if their transaction is cancelled or fails.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['failure_page'] ) ? '' : $getpaid_pages['failure_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['failure_page']) ? '' : $getpaid_pages['failure_page']['content'],
                     'help-tip'    => true,
                 ),
                 'invoice_history_page' => array(
                     'id'          => 'invoice_history_page',
-                    'name'        => __( 'Invoice History Page', 'invoicing' ),
-                    'desc'        => __( 'This page shows an invoice history for the current user. The <b>[wpinv_history]</b> short code should be on this page.', 'invoicing' ),
+                    'name'        => __('Invoice History Page', 'invoicing'),
+                    'desc'        => __('This page shows an invoice history for the current user. The <b>[wpinv_history]</b> short code should be on this page.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['invoice_history_page'] ) ? '' : $getpaid_pages['invoice_history_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['invoice_history_page']) ? '' : $getpaid_pages['invoice_history_page']['content'],
                     'help-tip'    => true,
                 ),
                 'invoice_subscription_page' => array(
                     'id'          => 'invoice_subscription_page',
-                    'name'        => __( 'Invoice Subscriptions Page', 'invoicing' ),
-                    'desc'        => __( 'This page shows subscriptions history for the current user. The <b>[wpinv_subscriptions]</b> short code should be on this page.', 'invoicing' ),
+                    'name'        => __('Invoice Subscriptions Page', 'invoicing'),
+                    'desc'        => __('This page shows subscriptions history for the current user. The <b>[wpinv_subscriptions]</b> short code should be on this page.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['invoice_subscription_page'] ) ? '' : $getpaid_pages['invoice_subscription_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['invoice_subscription_page']) ? '' : $getpaid_pages['invoice_subscription_page']['content'],
                     'help-tip'    => true,
                 ),
             ),
             'currency_section' => array(
                 'currency_settings' => array(
                     'id'   => 'currency_settings',
-                    'name' => '<h3>' . __( 'Currency Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Currency Settings', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'currency' => array(
                     'id'      => 'currency',
-                    'name'    => __( 'Currency', 'invoicing' ),
-                    'desc'    => __( 'Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing' ),
+                    'name'    => __('Currency', 'invoicing'),
+                    'desc'    => __('Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing'),
                     'type'    => 'select',
                     'class'       => 'wpi_select2',
                     'options' => $currency_code_options,
                 ),
                 'currency_position' => array(
                     'id'      => 'currency_position',
-                    'name'    => __( 'Currency Position', 'invoicing' ),
-                    'desc'    => __( 'Choose the location of the currency sign.', 'invoicing' ),
+                    'name'    => __('Currency Position', 'invoicing'),
+                    'desc'    => __('Choose the location of the currency sign.', 'invoicing'),
                     'type'    => 'select',
                     'class'   => 'wpi_select2',
                     'options'  => array(
-                        'left'        => __( 'Left', 'invoicing' ) . ' (' . $currency_symbol . wpinv_format_amount( '99.99' ) . ')',
-                        'right'       => __( 'Right', 'invoicing' ) . ' ('. wpinv_format_amount( '99.99' ) . $currency_symbol . ')',
-                        'left_space'  => __( 'Left with space', 'invoicing' ) . ' (' . $currency_symbol . ' ' . wpinv_format_amount( '99.99' ) . ')',
-                        'right_space' => __( 'Right with space', 'invoicing' ) . ' (' . wpinv_format_amount( '99.99' ) . ' ' . $currency_symbol . ')'
+                        'left'        => __('Left', 'invoicing') . ' (' . $currency_symbol . wpinv_format_amount('99.99') . ')',
+                        'right'       => __('Right', 'invoicing') . ' (' . wpinv_format_amount('99.99') . $currency_symbol . ')',
+                        'left_space'  => __('Left with space', 'invoicing') . ' (' . $currency_symbol . ' ' . wpinv_format_amount('99.99') . ')',
+                        'right_space' => __('Right with space', 'invoicing') . ' (' . wpinv_format_amount('99.99') . ' ' . $currency_symbol . ')'
                     )
                 ),
                 'thousands_separator' => array(
                     'id'   => 'thousands_separator',
-                    'name' => __( 'Thousands Separator', 'invoicing' ),
-                    'desc' => __( 'The symbol (usually , or .) to separate thousands', 'invoicing' ),
+                    'name' => __('Thousands Separator', 'invoicing'),
+                    'desc' => __('The symbol (usually , or .) to separate thousands', 'invoicing'),
                     'type' => 'text',
                     'size' => 'small',
                     'std'  => ',',
                 ),
                 'decimal_separator' => array(
                     'id'   => 'decimal_separator',
-                    'name' => __( 'Decimal Separator', 'invoicing' ),
-                    'desc' => __( 'The symbol (usually , or .) to separate decimal points', 'invoicing' ),
+                    'name' => __('Decimal Separator', 'invoicing'),
+                    'desc' => __('The symbol (usually , or .) to separate decimal points', 'invoicing'),
                     'type' => 'text',
                     'size' => 'small',
                     'std'  => '.',
                 ),
                 'decimals' => array(
                     'id'   => 'decimals',
-                    'name' => __( 'Number of Decimals', 'invoicing' ),
-                    'desc' => __( 'This sets the number of decimal points shown in displayed prices.', 'invoicing' ),
+                    'name' => __('Number of Decimals', 'invoicing'),
+                    'desc' => __('This sets the number of decimal points shown in displayed prices.', 'invoicing'),
                     'type' => 'number',
                     'size' => 'small',
                     'std'  => '2',
@@ -227,21 +227,21 @@ 
             'labels' => array(
                 'labels' => array(
                     'id'   => 'labels_settings',
-                    'name' => '<h3>' . __( 'Invoice Labels', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Invoice Labels', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'vat_invoice_notice_label' => array(
                     'id' => 'vat_invoice_notice_label',
-                    'name' => __( 'Invoice Notice Label', 'invoicing' ),
-                    'desc' => __( 'Use this to add an invoice notice section (label) to your invoices', 'invoicing' ),
+                    'name' => __('Invoice Notice Label', 'invoicing'),
+                    'desc' => __('Use this to add an invoice notice section (label) to your invoices', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
                 'vat_invoice_notice' => array(
                     'id' => 'vat_invoice_notice',
-                    'name' => __( 'Invoice notice', 'invoicing' ),
-                    'desc' =>   __( 'Use this to add an invoice notice section (description) to your invoices', 'invoicing' ),
+                    'name' => __('Invoice notice', 'invoicing'),
+                    'desc' =>   __('Use this to add an invoice notice section (description) to your invoices', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
@@ -253,22 +253,22 @@ 
             'main' => array(
                 'gateway_settings' => array(
                     'id'   => 'api_header',
-                    'name' => '<h3>' . __( 'Gateway Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Gateway Settings', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'gateways' => array(
                     'id'      => 'gateways',
-                    'name'    => __( 'Payment Gateways', 'invoicing' ),
-                    'desc'    => __( 'Choose the payment gateways you want to enable.', 'invoicing' ),
+                    'name'    => __('Payment Gateways', 'invoicing'),
+                    'desc'    => __('Choose the payment gateways you want to enable.', 'invoicing'),
                     'type'    => 'gateways',
-                    'std'     => array( 'manual'=>1 ),
+                    'std'     => array('manual'=>1),
                     'options' => wpinv_get_payment_gateways(),
                 ),
                 'default_gateway' => array(
                     'id'      => 'default_gateway',
-                    'name'    => __( 'Default Gateway', 'invoicing' ),
-                    'desc'    => __( 'This gateway will be loaded automatically with the checkout page.', 'invoicing' ),
+                    'name'    => __('Default Gateway', 'invoicing'),
+                    'desc'    => __('This gateway will be loaded automatically with the checkout page.', 'invoicing'),
                     'type'    => 'gateway_select',
                     'std'     => 'manual',
                     'class'   => 'wpi_select2',
@@ -283,32 +283,32 @@ 
             'main' => array(
                 'tax_settings' => array(
                     'id'   => 'tax_settings',
-                    'name' => '<h3>' . __( 'Tax Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Tax Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_taxes' => array(
                     'id'       => 'enable_taxes',
-                    'name'     => __( 'Enable Taxes', 'invoicing' ),
-                    'desc'     => __( 'Enable tax rates and calculations.', 'invoicing' ),
+                    'name'     => __('Enable Taxes', 'invoicing'),
+                    'desc'     => __('Enable tax rates and calculations.', 'invoicing'),
                     'type'     => 'checkbox',
                     'std'      => 0,
                 ),
 
                 'tax_subtotal_rounding' => array(
                     'id'                => 'tax_subtotal_rounding',
-                    'name'              => __( 'Rounding', 'invoicing' ),
-                    'desc'              => __( 'Round tax at subtotal level, instead of rounding per tax rate', 'invoicing' ),
+                    'name'              => __('Rounding', 'invoicing'),
+                    'desc'              => __('Round tax at subtotal level, instead of rounding per tax rate', 'invoicing'),
                     'type'              => 'checkbox',
                     'std'               => 1,
                 ),
 
                 'prices_include_tax' => array(
                     'id'      => 'prices_include_tax',
-                    'name'    => __( 'Prices entered with tax', 'invoicing' ),
+                    'name'    => __('Prices entered with tax', 'invoicing'),
                     'options' => array(
-                        'yes' => __( 'Yes, I will enter prices inclusive of tax', 'invoicing' ),
-                        'no'  => __( 'No, I will enter prices exclusive of tax', 'invoicing' ),
+                        'yes' => __('Yes, I will enter prices inclusive of tax', 'invoicing'),
+                        'no'  => __('No, I will enter prices exclusive of tax', 'invoicing'),
                     ),
                     'type'    => 'select',
                     'std'     => 'no',
@@ -316,10 +316,10 @@ 
 
                 'tax_base'              => array(
                     'id'                => 'tax_base',
-                    'name'              => __( 'Calculate tax based on', 'invoicing' ),
+                    'name'              => __('Calculate tax based on', 'invoicing'),
                     'options'           => array(
-                        'billing'       => __( 'Customer billing address', 'invoicing' ),
-                        'base'          => __( 'Shop base address', 'invoicing' ),
+                        'billing'       => __('Customer billing address', 'invoicing'),
+                        'base'          => __('Shop base address', 'invoicing'),
                     ),
                     'type'              => 'select',
                     'std'               => 'billing',
@@ -327,10 +327,10 @@ 
 
                 'tax_display_totals'    => array(
                     'id'                => 'tax_display_totals',
-                    'name'              => __( 'Display tax totals', 'invoicing' ),
+                    'name'              => __('Display tax totals', 'invoicing'),
                     'options'           => array(
-                        'single'        => __( 'As a single total', 'invoicing' ),
-                        'individual'    => __( 'As individual tax rates', 'invoicing' ),
+                        'single'        => __('As a single total', 'invoicing'),
+                        'individual'    => __('As individual tax rates', 'invoicing'),
                     ),
                     'type'              => 'select',
                     'std'               => 'individual',
@@ -338,8 +338,8 @@ 
 
                 'tax_rate' => array(
                     'id'   => 'tax_rate',
-                    'name' => __( 'Fallback Tax Rate', 'invoicing' ),
-                    'desc' => __( 'Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing' ),
+                    'name' => __('Fallback Tax Rate', 'invoicing'),
+                    'desc' => __('Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing'),
                     'type' => 'number',
                     'size' => 'small',
                     'min'  => '0',
@@ -351,8 +351,8 @@ 
             'rates' => array(
                 'tax_rates' => array(
                     'id'   => 'tax_rates',
-                    'name' => '<h3>' . __( 'Tax Rates', 'invoicing' ) . '</h3>',
-                    'desc' => __( 'Enter tax rates for specific regions.', 'invoicing' ),
+                    'name' => '<h3>' . __('Tax Rates', 'invoicing') . '</h3>',
+                    'desc' => __('Enter tax rates for specific regions.', 'invoicing'),
                     'type' => 'tax_rates',
                 ),
             ),
@@ -361,45 +361,45 @@ 
 
                 'vat_company_name' => array(
                     'id' => 'vat_company_name',
-                    'name' => __( 'Company Name', 'invoicing' ),
-                    'desc' => wp_sprintf(__( 'Verify your company name and  VAT number on the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                    'name' => __('Company Name', 'invoicing'),
+                    'desc' => wp_sprintf(__('Verify your company name and  VAT number on the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
 
                 'vat_number' => array(
                     'id'   => 'vat_number',
-                    'name' => __( 'VAT Number', 'invoicing' ),
-                    'desc' => __( 'Enter your VAT number including the country identifier, eg: GB123456789', 'invoicing' ),
+                    'name' => __('VAT Number', 'invoicing'),
+                    'desc' => __('Enter your VAT number including the country identifier, eg: GB123456789', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
 
                 'vat_prevent_b2c_purchase' => array(
                     'id' => 'vat_prevent_b2c_purchase',
-                    'name' => __( 'Prevent B2C Sales', 'invoicing' ),
-                    'desc' => __( 'Require everyone in the EU to provide a VAT number.', 'invoicing' ),
+                    'name' => __('Prevent B2C Sales', 'invoicing'),
+                    'desc' => __('Require everyone in the EU to provide a VAT number.', 'invoicing'),
                     'type' => 'checkbox'
                 ),
 
                 'validate_vat_number' => array(
                     'id'   => 'validate_vat_number',
-                    'name' => __( 'Validate VAT Number', 'invoicing' ),
-                    'desc' => __( 'Validate VAT numbers with VIES.', 'invoicing' ),
+                    'name' => __('Validate VAT Number', 'invoicing'),
+                    'desc' => __('Validate VAT numbers with VIES.', 'invoicing'),
                     'type' => 'checkbox'
                 ),
 
                 'vat_same_country_rule' => array(
                     'id'          => 'vat_same_country_rule',
-                    'name'        => __( 'Same Country Rule', 'invoicing' ),
-                    'desc'        => __( 'What should happen if a customer is from the same country as your business?', 'invoicing' ),
+                    'name'        => __('Same Country Rule', 'invoicing'),
+                    'desc'        => __('What should happen if a customer is from the same country as your business?', 'invoicing'),
                     'type'        => 'select',
                     'options'     => array(
-                        'no'        => __( 'Do not charge tax', 'invoicing' ),
-                        'always'    => __( 'Charge tax unless vat number is validated', 'invoicing' ),
-                        'vat_too'   => __( 'Charge tax even if vat number is validated', 'invoicing' )
+                        'no'        => __('Do not charge tax', 'invoicing'),
+                        'always'    => __('Charge tax unless vat number is validated', 'invoicing'),
+                        'vat_too'   => __('Charge tax even if vat number is validated', 'invoicing')
                     ),
-                    'placeholder' => __( 'Select an option', 'invoicing' ),
+                    'placeholder' => __('Select an option', 'invoicing'),
                     'std'         => 'vat_too',
                 ),
 
@@ -413,66 +413,66 @@ 
             'main' => array(
                 'email_settings_header' => array(
                     'id'   => 'email_settings_header',
-                    'name' => '<h3>' . __( 'Email Sender Options', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Email Sender Options', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'email_from_name' => array(
                     'id'   => 'email_from_name',
-                    'name' => __( 'From Name', 'invoicing' ),
-                    'desc' => __( 'Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing' ),
-                    'std' => esc_attr( get_bloginfo( 'name', 'display' ) ),
+                    'name' => __('From Name', 'invoicing'),
+                    'desc' => __('Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing'),
+                    'std' => esc_attr(get_bloginfo('name', 'display')),
                     'type' => 'text',
                 ),
                 'email_from' => array(
                     'id'   => 'email_from',
-                    'name' => __( 'From Email', 'invoicing' ),
-                    'desc' => sprintf (__( 'Email address to send invoice emails from. This will act as the "from" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%s', 'invoicing' ), $alert_wrapper_start, $alert_wrapper_close),
-                    'std' => get_option( 'admin_email' ),
+                    'name' => __('From Email', 'invoicing'),
+                    'desc' => sprintf(__('Email address to send invoice emails from. This will act as the "from" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%s', 'invoicing'), $alert_wrapper_start, $alert_wrapper_close),
+                    'std' => get_option('admin_email'),
                     'type' => 'text',
                 ),
                 'admin_email' => array(
                     'id'   => 'admin_email',
-                    'name' => __( 'Admin Email', 'invoicing' ),
-                    'desc' => __( 'Where should we send admin notifications? This will is also act as the "reply-to" address for invoice emails', 'invoicing' ),
-                    'std' => get_option( 'admin_email' ),
+                    'name' => __('Admin Email', 'invoicing'),
+                    'desc' => __('Where should we send admin notifications? This will is also act as the "reply-to" address for invoice emails', 'invoicing'),
+                    'std' => get_option('admin_email'),
                     'type' => 'text',
                 ),
                 'skip_email_free_invoice' => array(
                     'id'   => 'skip_email_free_invoice',
-                    'name' => __( 'Skip Free Invoices', 'invoicing' ),
-                    'desc' => __( 'Check this to disable sending emails for free invoices.', 'invoicing' ),
+                    'name' => __('Skip Free Invoices', 'invoicing'),
+                    'desc' => __('Check this to disable sending emails for free invoices.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => false,
                 ),
                 'overdue_settings_header' => array(
                     'id'   => 'overdue_settings_header',
-                    'name' => '<h3>' . __( 'Due Date Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Due Date Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'overdue_active' => array(
                     'id'   => 'overdue_active',
-                    'name' => __( 'Enable Due Date', 'invoicing' ),
-                    'desc' => __( 'Check this to enable due date option for invoices.', 'invoicing' ),
+                    'name' => __('Enable Due Date', 'invoicing'),
+                    'desc' => __('Check this to enable due date option for invoices.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => false,
                 ),
                 'email_template_header' => array(
                     'id'   => 'email_template_header',
-                    'name' => '<h3>' . __( 'Email Template', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Email Template', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'email_header_image' => array(
                     'id'   => 'email_header_image',
-                    'name' => __( 'Header Image', 'invoicing' ),
-                    'desc' => __( 'URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing' ),
+                    'name' => __('Header Image', 'invoicing'),
+                    'desc' => __('URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing'),
                     'std' => '',
                     'type' => 'text',
                 ),
                 'email_footer_text' => array(
                     'id'   => 'email_footer_text',
-                    'name' => __( 'Footer Text', 'invoicing' ),
-                    'desc' => __( 'The text to appear in the footer of all invoice emails.', 'invoicing' ),
-                    'std' => get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ),
+                    'name' => __('Footer Text', 'invoicing'),
+                    'desc' => __('The text to appear in the footer of all invoice emails.', 'invoicing'),
+                    'std' => get_bloginfo('name', 'display') . ' - ' . __('Powered by GetPaid', 'invoicing'),
                     'type' => 'textarea',
                     'class' => 'regular-text',
                     'rows' => 2,
@@ -480,29 +480,29 @@ 
                 ),
                 'email_base_color' => array(
                     'id'   => 'email_base_color',
-                    'name' => __( 'Base Color', 'invoicing' ),
-                    'desc' => __( 'The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing' ),
+                    'name' => __('Base Color', 'invoicing'),
+                    'desc' => __('The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing'),
                     'std' => '#557da2',
                     'type' => 'color',
                 ),
                 'email_background_color' => array(
                     'id'   => 'email_background_color',
-                    'name' => __( 'Background Color', 'invoicing' ),
-                    'desc' => __( 'The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing' ),
+                    'name' => __('Background Color', 'invoicing'),
+                    'desc' => __('The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing'),
                     'std' => '#f5f5f5',
                     'type' => 'color',
                 ),
                 'email_body_background_color' => array(
                     'id'   => 'email_body_background_color',
-                    'name' => __( 'Body Background Color', 'invoicing' ),
-                    'desc' => __( 'The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing' ),
+                    'name' => __('Body Background Color', 'invoicing'),
+                    'desc' => __('The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing'),
                     'std' => '#fdfdfd',
                     'type' => 'color',
                 ),
                 'email_text_color' => array(
                     'id'   => 'email_text_color',
-                    'name' => __( 'Body Text Color', 'invoicing' ),
-                    'desc' => __( 'The main body text color. Default <code>#505050</code>.', 'invoicing' ),
+                    'name' => __('Body Text Color', 'invoicing'),
+                    'desc' => __('The main body text color. Default <code>#505050</code>.', 'invoicing'),
                     'std' => '#505050',
                     'type' => 'color',
                 ),
@@ -517,7 +517,7 @@ 
     ),
 
     // Integrations.
-    'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'settings', 'id' ),
+    'integrations' => wp_list_pluck(getpaid_get_integration_settings(), 'settings', 'id'),
 
     /** Privacy Settings */
     'privacy' => apply_filters('wpinv_settings_privacy',
@@ -525,17 +525,17 @@ 
             'main' => array(
                 'invoicing_privacy_policy_settings' => array(
                     'id'   => 'invoicing_privacy_policy_settings',
-                    'name' => '<h3>' . __( 'Privacy Policy', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Privacy Policy', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'privacy_page' => array(
                     'id'          => 'privacy_page',
-                    'name'        => __( 'Privacy Page', 'invoicing' ),
-                    'desc'        => __( 'If no privacy policy page set in Settings->Privacy default settings, this page will be used on checkout page.', 'invoicing' ),
+                    'name'        => __('Privacy Page', 'invoicing'),
+                    'desc'        => __('If no privacy policy page set in Settings->Privacy default settings, this page will be used on checkout page.', 'invoicing'),
                     'type'        => 'select',
-                    'options'     => wpinv_get_pages( true,  __( 'Select a page', 'invoicing' )),
+                    'options'     => wpinv_get_pages(true, __('Select a page', 'invoicing')),
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
+                    'placeholder' => __('Select a page', 'invoicing'),
                 ),
             ),
         )
@@ -546,19 +546,19 @@ 
             'main' => array(
                 'invoice_number_format_settings' => array(
                     'id'   => 'invoice_number_format_settings',
-                    'name' => '<h3>' . __( 'Invoice Number', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Invoice Number', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'sequential_invoice_number' => array(
                     'id'   => 'sequential_invoice_number',
-                    'name' => __( 'Sequential Invoice Numbers', 'invoicing' ),
-                    'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing' ) . $reset_number,
+                    'name' => __('Sequential Invoice Numbers', 'invoicing'),
+                    'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing') . $reset_number,
                     'type' => 'checkbox',
                 ),
                 'invoice_sequence_start' => array(
                     'id'   => 'invoice_sequence_start',
-                    'name' => __( 'Sequential Starting Number', 'invoicing' ),
-                    'desc' => __( 'The number at which the invoice number sequence should begin.', 'invoicing' ) . $last_number,
+                    'name' => __('Sequential Starting Number', 'invoicing'),
+                    'desc' => __('The number at which the invoice number sequence should begin.', 'invoicing') . $last_number,
                     'type' => 'number',
                     'size' => 'small',
                     'std'  => '1',
@@ -566,8 +566,8 @@ 
                 ),
                 'invoice_number_padd' => array(
                     'id'      => 'invoice_number_padd',
-                    'name'    => __( 'Minimum Digits', 'invoicing' ),
-                    'desc'    => __( 'If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing' ),
+                    'name'    => __('Minimum Digits', 'invoicing'),
+                    'desc'    => __('If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing'),
                     'type'    => 'select',
                     'options' => $invoice_number_padd_options,
                     'std'     => 5,
@@ -575,8 +575,8 @@ 
                 ),
                 'invoice_number_prefix' => array(
                     'id' => 'invoice_number_prefix',
-                    'name' => __( 'Invoice Number Prefix', 'invoicing' ),
-                    'desc' => __( 'Prefix for all invoice numbers. Ex: INV-', 'invoicing' ),
+                    'name' => __('Invoice Number Prefix', 'invoicing'),
+                    'desc' => __('Prefix for all invoice numbers. Ex: INV-', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                     'std' => 'INV-',
@@ -584,46 +584,46 @@ 
                 ),
                 'invoice_number_postfix' => array(
                     'id' => 'invoice_number_postfix',
-                    'name' => __( 'Invoice Number Postfix', 'invoicing' ),
-                    'desc' => __( 'Postfix for all invoice numbers.', 'invoicing' ),
+                    'name' => __('Invoice Number Postfix', 'invoicing'),
+                    'desc' => __('Postfix for all invoice numbers.', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                     'std' => ''
                 ),
                 'checkout_settings' => array(
                     'id'   => 'checkout_settings',
-                    'name' => '<h3>' . __( 'Checkout Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Checkout Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'disable_new_user_emails' => array(
                     'id'   => 'disable_new_user_emails',
-                    'name' => __( 'Disable new user emails', 'invoicing' ),
-                    'desc' => __( 'Do not send an email to customers when a new user account is created for them.', 'invoicing' ),
+                    'name' => __('Disable new user emails', 'invoicing'),
+                    'desc' => __('Do not send an email to customers when a new user account is created for them.', 'invoicing'),
                     'type' => 'checkbox',
                 ),
                 'login_to_checkout' => array(
                     'id'   => 'login_to_checkout',
-                    'name' => __( 'Require Login To Checkout', 'invoicing' ),
-                    'desc' => __( 'If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing' ),
+                    'name' => __('Require Login To Checkout', 'invoicing'),
+                    'desc' => __('If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing'),
                     'type' => 'checkbox',
                 ),
                 'maxmind_license_key' => array(
                     'id'   => 'maxmind_license_key',
-                    'name' => __( 'MaxMind License Key', 'invoicing' ),
+                    'name' => __('MaxMind License Key', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
-                    'desc' => __( "Enter you license key if you would like to use MaxMind to automatically detect a customer's country.", 'invoicing' ) . ' <a href="https://support.maxmind.com/account-faq/license-keys/how-do-i-generate-a-license-key/">' . __( 'How to generate a free license key.', 'invoicing' ) . '</a>',
+                    'desc' => __("Enter you license key if you would like to use MaxMind to automatically detect a customer's country.", 'invoicing') . ' <a href="https://support.maxmind.com/account-faq/license-keys/how-do-i-generate-a-license-key/">' . __('How to generate a free license key.', 'invoicing') . '</a>',
                 ),
 
                 'uninstall_settings' => array(
                     'id'   => 'uninstall_settings',
-                    'name' => '<h3>' . __( 'Uninstall Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Uninstall Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'remove_data_on_unistall' => array(
                     'id'   => 'remove_data_on_unistall',
-                    'name' => __( 'Remove Data on Uninstall?', 'invoicing' ),
-                    'desc' => __( 'Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing' ),
+                    'name' => __('Remove Data on Uninstall?', 'invoicing'),
+                    'desc' => __('Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => ''
                 ),
@@ -632,13 +632,13 @@ 
             'custom-css' => array(
                 'css_settings' => array(
                     'id'   => 'css_settings',
-                    'name' => '<h3>' . __( 'Custom CSS', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Custom CSS', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'template_custom_css' => array(
                     'id' => 'template_custom_css',
-                    'name' => __( 'Invoice Template CSS', 'invoicing' ),
-                    'desc' => __( 'Add CSS to modify appearance of the print invoice page.', 'invoicing' ),
+                    'name' => __('Invoice Template CSS', 'invoicing'),
+                    'desc' => __('Add CSS to modify appearance of the print invoice page.', 'invoicing'),
                     'type' => 'textarea',
                     'class'=> 'regular-text',
                     'rows' => 10,
@@ -652,8 +652,8 @@ 
             'main' => array(
                 'tool_settings' => array(
                     'id'   => 'tool_settings',
-                    'name' => '<h3>' . __( 'Diagnostic Tools', 'invoicing' ) . '</h3>',
-                    'desc' => __( 'Invoicing diagnostic tools', 'invoicing' ),
+                    'name' => '<h3>' . __('Diagnostic Tools', 'invoicing') . '</h3>',
+                    'desc' => __('Invoicing diagnostic tools', 'invoicing'),
                     'type' => 'tools',
                 ),
             ),

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

Indentation +70 added lines, -70 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,21 +126,21 @@ 
 			</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 ) ) :
-				//print_r($addons);
-				?>
+            if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
+                //print_r($addons);
+                ?>
 				<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">
@@ -148,32 +148,32 @@ 
 										<img src="<?php echo esc_attr( $addon->info->thumbnail ); ?>"/>
 									<?php endif;
 
-									if ( 'stripe-payment-gateway' == $addon->info->slug ) {
-										$addon->info->slug = 'getpaid-stripe-payments';
-										$addon->info->link = 'https://wordpress.org/plugins/getpaid-stripe-payments/';
-									}
-
-									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" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.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://wpgetpaid.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 ( 'stripe-payment-gateway' == $addon->info->slug ) {
+                                        $addon->info->slug = 'getpaid-stripe-payments';
+                                        $addon->info->link = 'https://wordpress.org/plugins/getpaid-stripe-payments/';
+                                    }
+
+                                    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" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.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://wpgetpaid.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>
 
@@ -181,15 +181,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>
@@ -208,8 +208,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>
 

Spacing +55 added lines, -55 removed lines

@@ -3,7 +3,7 @@ 
  * Admin View: Page - Addons
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 add_ThickBox();
@@ -11,19 +11,19 @@ 
 <div class="wrap wpi_addons_wrap">
 	<h1><?php echo get_admin_page_title(); ?></h1>
 
-	<?php if ( $tabs ){ ?>
+	<?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>';
+			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' );
+			do_action('wpi_addons_tabs');
 			?>
 		</nav>
 
 		<?php
 
-		if($current_tab == 'membership'){
+		if ($current_tab == 'membership') {
 
 			?>
 
@@ -32,42 +32,42 @@ 
 <!--
 				<h2>With our WPInvoicing Membership you get access to all our products!</h2>
 				<p><a class="button button-primary" href="https://wpinvoicing.com/downloads/membership/">View Memberships</a></p>-->
-				<?php if(defined('WP_EASY_UPDATES_ACTIVE')){?>
-					<h2><?php _e("Have a membership key?","invoicing");?></h2>
+				<?php if (defined('WP_EASY_UPDATES_ACTIVE')) {?>
+					<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 }?>
 
 				<div class="membership-cta-contet">
 					<div class="main-cta">
-							<h2><?php _e("Membership benefits Include:","invoicing");?></h2>
+							<h2><?php _e("Membership benefits Include:", "invoicing"); ?></h2>
 							<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>';
+									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">
-										<h3><?php _e("Membership Starts from","invoicing");?></h3>
+										<h3><?php _e("Membership Starts from", "invoicing"); ?></h3>
 										<h4>$99</h4>
-										<a href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php _e("Buy Membership","invoicing");?></a>
+										<a href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php _e("Buy Membership", "invoicing"); ?></a>
 									</div>
-									<h3><?php _e("Included Gateways:","invoicing");?></h3>
+									<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>';
 											}
 										}
 										?>
@@ -81,7 +81,7 @@ 
 						<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">
@@ -101,7 +101,7 @@ 
 						<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">
@@ -117,8 +117,8 @@ 
 						</div>
 					</div>
 					<div class="member-footer">
-						<a class="footer-btn" href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php _e("Buy Membership","invoicing");?></a>
-						<a class="footer-link" href="post-new.php?post_type=wpi_invoice"><?php _e("Create Invoice","invoicing");?></a>
+						<a class="footer-btn" href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php _e("Buy Membership", "invoicing"); ?></a>
+						<a class="footer-link" href="post-new.php?post_type=wpi_invoice"><?php _e("Create Invoice", "invoicing"); ?></a>
 					</div>
 				</div>
 
@@ -126,50 +126,50 @@ 
 			</div>
 		</div>
 			<?php
-		}else{
+		} 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)) :
 				//print_r($addons);
 				?>
-				<ul class="wpi-products"><?php foreach ( $addons as $addon ) :
-                        if(965==$addon->info->id){continue;}// don't show quote add on
+				<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">
 								<div class="wpi-product-title">
 									<h3><?php
-										if ( ! empty( $addon->info->excerpt) ){
-											echo wpi_help_tip( $addon->info->excerpt );
+										if (!empty($addon->info->excerpt)) {
+											echo wpi_help_tip($addon->info->excerpt);
 										}
-										echo esc_html( $addon->info->title ); ?></h3>
+										echo esc_html($addon->info->title); ?></h3>
 								</div>
 
 								<span class="wpi-product-image">
-									<?php if ( ! empty( $addon->info->thumbnail) ) : ?>
-										<img src="<?php echo esc_attr( $addon->info->thumbnail ); ?>"/>
+									<?php if (!empty($addon->info->thumbnail)) : ?>
+										<img src="<?php echo esc_attr($addon->info->thumbnail); ?>"/>
 									<?php endif;
 
-									if ( 'stripe-payment-gateway' == $addon->info->slug ) {
+									if ('stripe-payment-gateway' == $addon->info->slug) {
 										$addon->info->slug = 'getpaid-stripe-payments';
 										$addon->info->link = 'https://wordpress.org/plugins/getpaid-stripe-payments/';
 									}
 
-									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>';
+									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" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.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://wpgetpaid.com&TB_iframe=true');
-										}else{
+									}elseif (isset($addon->info->link) && (substr($addon->info->link, 0, 23) === "https://wpinvoicing.com" || substr($addon->info->link, 0, 21) === "https://wpgetpaid.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://wpgetpaid.com&TB_iframe=true');
+										} else {
 											// if installed show activation link
-											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
+											if (isset($installed_plugins['wp-easy-updates/external-updates.php'])) {
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
+											} 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 href="' . $url . '" class="thickbox">';
+										echo '<span class="wpi-product-info">' . __('More info', 'invoicing') . '</span>';
 										echo '</a>';
 									}
 
@@ -180,7 +180,7 @@ 
 
 								<span class="wpi-product-button">
 									<?php
-                                    $addon_obj->output_button( $addon );
+                                    $addon_obj->output_button($addon);
 									?>
 								</span>
 
@@ -194,21 +194,21 @@ 
 
 	<div class="clearfix" ></div>
 
-	<?php if($current_tab =='addons'){ ?>
-	<p><?php printf( __( 'All of our Invoicing Addons can be found on WPInvoicing.com here: <a href="%s">Invoicing Addons</a>', 'invoicing' ), 'https://wpinvoicing.com/downloads/category/addons/' ); ?></p>
-	<?php } if($current_tab =='gateways'){  ?>
-    <p><?php printf( __( 'All of our Invoicing Payment Gateways can be found on WPInvoicing.com here: <a href="%s">Invoicing Payment Gateways</a>', 'invoicing' ), 'https://wpinvoicing.com/downloads/category/gateways/' ); ?></p>
+	<?php if ($current_tab == 'addons') { ?>
+	<p><?php printf(__('All of our Invoicing Addons can be found on WPInvoicing.com here: <a href="%s">Invoicing Addons</a>', 'invoicing'), 'https://wpinvoicing.com/downloads/category/addons/'); ?></p>
+	<?php } if ($current_tab == 'gateways') {  ?>
+    <p><?php printf(__('All of our Invoicing Payment Gateways can be found on WPInvoicing.com here: <a href="%s">Invoicing Payment Gateways</a>', 'invoicing'), 'https://wpinvoicing.com/downloads/category/gateways/'); ?></p>
     <?php } ?>
 
-	<div id="wpi-wpeu-required-activation" style="display:none;"><span class="wpi-notification "><?php printf( __("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s'>activate</a> it now.",'invoicing'),wp_nonce_url(admin_url('plugins.php?action=activate&plugin=wp-easy-updates/external-updates.php'), 'activate-plugin_wp-easy-updates/external-updates.php'));?></span></div>
-	<div id="wpi-wpeu-required-for-external" style="display:none;"><span class="wpi-notification "><?php printf(  __("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s' onclick='window.open(\"https://wpeasyupdates.com/wp-easy-updates.zip\", \"_blank\");' >download</a> and install it now.",'invoicing'),admin_url("plugin-install.php?tab=upload&wpeu-install=true"));?></span></div>
+	<div id="wpi-wpeu-required-activation" style="display:none;"><span class="wpi-notification "><?php printf(__("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s'>activate</a> it now.", 'invoicing'), wp_nonce_url(admin_url('plugins.php?action=activate&plugin=wp-easy-updates/external-updates.php'), 'activate-plugin_wp-easy-updates/external-updates.php')); ?></span></div>
+	<div id="wpi-wpeu-required-for-external" style="display:none;"><span class="wpi-notification "><?php printf(__("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s' onclick='window.open(\"https://wpeasyupdates.com/wp-easy-updates.zip\", \"_blank\");' >download</a> and install it now.", 'invoicing'), admin_url("plugin-install.php?tab=upload&wpeu-install=true")); ?></span></div>
 	<div id="wpeu-licence-popup" style="display:none;">
 		<span class="wpi-notification noti-white">
-			<h3 class="wpeu-licence-title"><?php _e("Licence key",'invoicing');?></h3>
-			<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>
+			<h3 class="wpeu-licence-title"><?php _e("Licence key", 'invoicing'); ?></h3>
+			<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>

Braces +4 added lines, -4 removed lines

@@ -126,7 +126,7 @@ 
 			</div>
 		</div>
 			<?php
-		}else{
+		} else{
 			$installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
 			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
@@ -157,14 +157,14 @@ 
 										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" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.com" ) ){
+									} elseif(isset($addon->info->link) && ( substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com" || substr( $addon->info->link, 0, 21 ) === "https://wpgetpaid.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://wpgetpaid.com&TB_iframe=true');
-										}else{
+										} 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{
+											} else{
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
 											}
 										}

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 +145 added lines, -145 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,22 +130,22 @@ 
     $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' ),
-            'company_id'    => __( 'Company ID', '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'),
+            'company_id'    => __('Company ID', '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;
@@ -156,8 +156,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());
 }
 
 /**
@@ -167,24 +167,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);
             }
 
         }
@@ -192,7 +192,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.
@@ -201,14 +201,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();
     }
 
@@ -218,13 +218,13 @@ 
         '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);
     }
 
-    $address = array_filter( $address );
+    $address = array_filter($address);
 
-    if ( ! $with_default ) {
+    if (!$with_default) {
         return $address;
     }
 
@@ -235,7 +235,7 @@ 
         'country'    => wpinv_get_default_country(),
     );
 
-    return getpaid_array_merge_if_empty( $address, $defaults );
+    return getpaid_array_merge_if_empty($address, $defaults);
 
 }
 
@@ -246,7 +246,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_',
@@ -254,15 +254,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;
         }
 
@@ -279,16 +279,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;
@@ -304,12 +304,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;
 		}
 	}
@@ -325,13 +325,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;
@@ -344,8 +344,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);
 }
 
 /**
@@ -355,22 +355,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);
 }
 
 /**
@@ -380,7 +380,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'));
 }
 
 /**
@@ -390,7 +390,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'));
 }
 
 /**
@@ -400,7 +400,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'));
 }
 
 /**
@@ -410,7 +410,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'));
 }
 
 /**
@@ -420,7 +420,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'));
 }
 
 /**
@@ -430,7 +430,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'));
 }
 
 /**
@@ -440,7 +440,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'));
 }
 
 /**
@@ -450,7 +450,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'));
 }
 
 /**
@@ -460,7 +460,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'));
 }
 
 /**
@@ -470,7 +470,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'));
 }
 
 /**
@@ -480,7 +480,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'));
 }
 
 /**
@@ -490,7 +490,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'));
 }
 
 /**
@@ -500,7 +500,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'));
 }
 
 /**
@@ -510,7 +510,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'));
 }
 
 /**
@@ -520,7 +520,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'));
 }
 
 /**
@@ -530,7 +530,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'));
 }
 
 /**
@@ -540,7 +540,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'));
 }
 
 /**
@@ -550,7 +550,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'));
 }
 
 /**
@@ -560,7 +560,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'));
 }
 
 /**
@@ -570,7 +570,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'));
 }
 
 /**
@@ -580,7 +580,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'));
 }
 
 /**
@@ -590,7 +590,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'));
 }
 
 /**
@@ -600,31 +600,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';
@@ -633,10 +633,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);
 }
 
 /**
@@ -648,7 +648,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}}",
@@ -697,9 +697,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();
     }
 
@@ -707,7 +707,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.
@@ -719,7 +719,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);
 }
 
 /**
@@ -730,7 +730,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'           => '',
@@ -743,22 +743,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.
@@ -769,14 +769,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;
@@ -790,6 +790,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/views/wizard-header.php

Indentation +4 added lines, -4 removed lines

@@ -20,13 +20,13 @@
 			<title><?php esc_html_e( 'GetPaid &rsaquo; Setup Wizard', 'invoicing' ); ?></title>
 			<?php
                 getpaid_admin()->enqeue_scripts();
-				wp_enqueue_style( 'font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(), 'v5.13.0' );
-				wp_print_styles( 'select2' );
+                wp_enqueue_style( 'font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(), 'v5.13.0' );
+                wp_print_styles( 'select2' );
                 wp_print_scripts( 'select2' );
-				wp_print_scripts( 'wpinv-admin-script' );
+                wp_print_scripts( 'wpinv-admin-script' );
                 do_action( 'admin_print_styles' );
                 do_action( 'admin_head' );
-			?>
+            ?>
 			<style>
 				body, p{
 					font-size: 16px;

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $aui_settings = AyeCode_UI_Settings::instance();
 $aui_settings->enqueue_scripts();
@@ -17,15 +17,15 @@ 
 		<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
                 getpaid_admin()->enqeue_scripts();
-				wp_enqueue_style( 'font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(), 'v5.13.0' );
-				wp_print_styles( 'select2' );
-                wp_print_scripts( 'select2' );
-				wp_print_scripts( 'wpinv-admin-script' );
-                do_action( 'admin_print_styles' );
-                do_action( 'admin_head' );
+				wp_enqueue_style('font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(), 'v5.13.0');
+				wp_print_styles('select2');
+                wp_print_scripts('select2');
+				wp_print_scripts('wpinv-admin-script');
+                do_action('admin_print_styles');
+                do_action('admin_head');
 			?>
 			<style>
 				body, p{
@@ -37,21 +37,21 @@ 
                     font-weight: 500;
                     margin-bottom: .1rem;
                 }
-				<?php echo $aui_settings::css_primary( '#009874', true ); ?>
+				<?php 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'] ) ) : ?>
+            <?php if (isset($_REQUEST['step'])) : ?>
                 <ol class="gp-setup-steps mb-0 pb-4 mw-100 list-group list-group-horizontal text-center">
-                    <?php foreach ( $steps as $step => $data ) : ?>
+                    <?php foreach ($steps as $step => $data) : ?>
                         <li class="list-group-item flex-fill rounded-0 <?php
                             echo $step == $current ? 'active' : 'd-none d-md-block';
-                            echo array_search( $current, array_keys( $steps ) ) > array_search( $step, array_keys( $steps ) ) ? ' done' : '';
+                            echo array_search($current, array_keys($steps)) > array_search($step, array_keys($steps)) ? ' done' : '';
                         ?>">
-                            <i class="far fa-check-circle <?php echo array_search( $current, array_keys( $steps ) ) > array_search( $step, array_keys( $steps ) ) ? 'text-success' : '' ;?>"></i>
-                            <?php echo esc_html( $data['name'] ); ?>
+                            <i class="far fa-check-circle <?php echo array_search($current, array_keys($steps)) > array_search($step, array_keys($steps)) ? 'text-success' : ''; ?>"></i>
+                            <?php echo esc_html($data['name']); ?>
                         </li>
                     <?php endforeach; ?>
                 </ol>
@@ -62,7 +62,7 @@ 
             <div class="text-center pb-3 mt-5">
                 <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>
             </div>
\ No newline at end of file

Braces +5 added lines, -2 removed lines

@@ -55,9 +55,12 @@
                         </li>
                     <?php endforeach; ?>
                 </ol>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <div class='mb-3'>&nbsp;</div>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
             <div class="text-center pb-3 mt-5">
                 <a class=" text-decoration-none" href="https://wpgetpaid.com/">

includes/admin/views/wizard-plugins.php

Spacing +12 added lines, -12 removed lines

@@ -4,30 +4,30 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class="card shadow-sm my-5">'
 
-    <form method="post" class="text-center card-body" action="<?php echo esc_url( admin_url() ); ?>">
-		<?php getpaid_hidden_field( 'getpaid-admin-action', 'install_plugin' ); ?>
-		<?php wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' ); ?>
-		<?php getpaid_hidden_field( 'redirect', $next_url ); ?>
+    <form method="post" class="text-center card-body" action="<?php echo esc_url(admin_url()); ?>">
+		<?php getpaid_hidden_field('getpaid-admin-action', 'install_plugin'); ?>
+		<?php wp_nonce_field('getpaid-nonce', 'getpaid-nonce'); ?>
+		<?php getpaid_hidden_field('redirect', $next_url); ?>
 		<div class="gd-wizard-recommend">
 
-			<h2 class="gd-settings-title h3"><?php _e( 'Recommended Plugins', 'invoicing' ); ?></h2>
-			<p><?php _e( 'Below are a few of our own plugins that may help you.', 'invoicing' ); ?></p>
+			<h2 class="gd-settings-title h3"><?php _e('Recommended Plugins', 'invoicing'); ?></h2>
+			<p><?php _e('Below are a few of our own plugins that may help you.', 'invoicing'); ?></p>
 
 			<ul class="list-group">
-				<?php foreach ( $recommended_plugins as $plugin ) : ?>
+				<?php foreach ($recommended_plugins as $plugin) : ?>
 				<li class="list-group-item d-flex justify-content-between align-items-center flex-wrap text-left">
-					<span class="mr-auto"><?php echo esc_html( $plugin['name'] ); ?></span>
+					<span class="mr-auto"><?php echo esc_html($plugin['name']); ?></span>
 					<div class="custom-control custom-switch getpaid-install-plugin-siwtch-div mr-n2">
-						<input type="checkbox" name="plugins[<?php echo esc_attr( $plugin['slug'] ); ?>]" value="<?php echo esc_attr( $plugin['file'] ); ?>" class="custom-control-input"  <?php if( is_plugin_active( $plugin['slug'] ) ){echo "checked";} ?>>
+						<input type="checkbox" name="plugins[<?php echo esc_attr($plugin['slug']); ?>]" value="<?php echo esc_attr($plugin['file']); ?>" class="custom-control-input"  <?php if (is_plugin_active($plugin['slug'])) {echo "checked"; } ?>>
 						<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 endforeach; ?>
 			</ul>
@@ -36,7 +36,7 @@ 
 				<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>
 
 		</div>

includes/admin/views/wizard-settings.php

Spacing +24 added lines, -24 removed lines

@@ -4,15 +4,15 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class="card shadow-sm my-5">
 
     <form method="post" class="text-left card-body" action="options.php">
-        <?php settings_fields( 'wpinv_settings' ); ?>
-        <input type="hidden" name="_wp_http_referer" value="<?php echo esc_url( $next_url ); ?>">
+        <?php settings_fields('wpinv_settings'); ?>
+        <input type="hidden" name="_wp_http_referer" value="<?php echo esc_url($next_url); ?>">
 
         <table class="gp-setup-maps w-100 " cellspacing="0">
             <tbody>
@@ -20,28 +20,28 @@ 
 
                     global $wp_settings_fields;
 
-                    if ( isset( $wp_settings_fields[ $page ][ $section ] ) ) {
-                        $settings =  $wp_settings_fields[ $page ][ $section ];
+                    if (isset($wp_settings_fields[$page][$section])) {
+                        $settings = $wp_settings_fields[$page][$section];
 
-                        foreach ( $settings as $field ) {
+                        foreach ($settings as $field) {
 
-                            $name      = esc_attr( $field['id'] );
-                            $id        = sanitize_key( $name );
+                            $name      = esc_attr($field['id']);
+                            $id        = sanitize_key($name);
                             $class     = '';
-                            $value     = isset( $field['args']['std'] ) ? $field['args']['std'] : '';
-                            $value     = wpinv_clean( wpinv_get_option( $field['args']['id'], $value ) );
-                            $help_text = isset( $field['args']['desc'] ) ? wp_kses_post( $field['args']['desc'] ) : '';
-                            $type      = str_replace( 'wpinv_', '', str_replace( '_callback', '', $field['callback'] ) );
-                            $label     = isset( $field['args']['name'] ) ? wp_kses_post( $field['args']['name'] ) : '';
-                            $options   = isset( $field['args']['options'] ) ? $field['args']['options'] : array();
+                            $value     = isset($field['args']['std']) ? $field['args']['std'] : '';
+                            $value     = wpinv_clean(wpinv_get_option($field['args']['id'], $value));
+                            $help_text = isset($field['args']['desc']) ? wp_kses_post($field['args']['desc']) : '';
+                            $type      = str_replace('wpinv_', '', str_replace('_callback', '', $field['callback']));
+                            $label     = isset($field['args']['name']) ? wp_kses_post($field['args']['name']) : '';
+                            $options   = isset($field['args']['options']) ? $field['args']['options'] : array();
                         
-                            if ( false !== strpos( $name, 'logo') ) {
+                            if (false !== strpos($name, 'logo')) {
                                 $type = 'hidden';
                             }
                         
-                            if ( 'country_states' == $type ) {
+                            if ('country_states' == $type) {
                         
-                                if ( 0 == count( wpinv_get_country_states( wpinv_get_default_country() ) ) ) {
+                                if (0 == count(wpinv_get_country_states(wpinv_get_default_country()))) {
                                     $type = 'text';
                                 } else {
                                     $type = 'select';
@@ -50,11 +50,11 @@ 
                                 $class = 'getpaid_js_field-state';
                             }
                         
-                            if ( 'wpinv_settings[default_country]' == $name ) {
+                            if ('wpinv_settings[default_country]' == $name) {
                                 $class = 'getpaid_js_field-country';
                             }
                         
-                            switch ( $type ) {
+                            switch ($type) {
                         
                                 case 'hidden':
                                     echo "<input type='hidden' id='$id' name='$name' value='$value' />";
@@ -66,7 +66,7 @@ 
                                             'type'       => $type,
                                             'id'         => $id,
                                             'name'       => $name,
-                                            'value'      => is_scalar( $value ) ? esc_attr( $value ) : '',
+                                            'value'      => is_scalar($value) ? esc_attr($value) : '',
                                             'required'   => false,
                                             'help_text'  => $help_text,
                                             'label'      => $label,
@@ -82,7 +82,7 @@ 
                                         array(
                                             'id'              => $id,
                                             'name'            => $name,
-                                            'value'           => is_scalar( $value ) ? esc_textarea( $value ) : '',
+                                            'value'           => is_scalar($value) ? esc_textarea($value) : '',
                                             'required'        => false,
                                             'help_text'       => $help_text,
                                             'label'           => $label,
@@ -94,7 +94,7 @@ 
                                     );
                         
                                     // Bug fixed in AUI 0.1.51 for name stripping []
-                                    echo str_replace( sanitize_html_class( $name ), esc_attr( $name ), $textarea );
+                                    echo str_replace(sanitize_html_class($name), esc_attr($name), $textarea);
                         
                                     break;
                                 case 'select':
@@ -103,7 +103,7 @@ 
                                             'id'              =>  $id,
                                             'name'            =>  $name,
                                             'placeholder'     => '',
-                                            'value'           => is_scalar( $value ) ? esc_attr( $value ) : '',
+                                            'value'           => is_scalar($value) ? esc_attr($value) : '',
                                             'required'        => false,
                                             'help_text'       => $help_text,
                                             'label'           => $label,
@@ -128,7 +128,7 @@ 
 				<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>
         </table>
     </form>

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-items.php

Indentation +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -319,10 +319,10 @@ 
     }
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output2( $post ) {
 
         // Prepare the invoice.

Spacing +155 added lines, -155 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -16,82 +16,82 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Items {
 
-    public static function get_columns( $invoice ) {
+    public static function get_columns($invoice) {
         $use_taxes          = $invoice->is_taxable() && wpinv_use_taxes();
         $columns            = array(
-            'id'     => __( 'ID', 'invoicing' ),
-            'title'  => __( 'Item', 'invoicing' ),
+            'id'     => __('ID', 'invoicing'),
+            'title'  => __('Item', 'invoicing'),
             'price'  => sprintf(
                 '<span class="getpaid-hide-if-hours getpaid-hide-if-quantity">%s</span>
                 <span class="getpaid-hide-if-hours hide-if-amount">%s</span>
                 <span class="getpaid-hide-if-quantity hide-if-amount">%s</span>',
-                __( 'Amount', 'invoicing' ),
-                __( 'Price', 'invoicing' ),
-                __( 'Rate', 'invoicing' )
+                __('Amount', 'invoicing'),
+                __('Price', 'invoicing'),
+                __('Rate', 'invoicing')
             ),
             'qty'    => sprintf(
                 '<span class="getpaid-hide-if-hours">%s</span><span class="getpaid-hide-if-quantity">%s</span>',
-                __( 'Quantity', 'invoicing' ),
-                __( 'Hours', 'invoicing' )
+                __('Quantity', 'invoicing'),
+                __('Hours', 'invoicing')
             ),
-            'total'  => __( 'Total', 'invoicing' ),
-            'tax'    => __( 'Tax (%)', 'invoicing' ),
+            'total'  => __('Total', 'invoicing'),
+            'tax'    => __('Tax (%)', 'invoicing'),
             'action' => '',
         );
 
-        if ( ! $use_taxes ) {
-            unset( $columns['tax'] );
+        if (!$use_taxes) {
+            unset($columns['tax']);
         }
 
         return $columns;
     }
 
-    public static function output( $post, $invoice = false ) {
+    public static function output($post, $invoice = false) {
 
-        if ( apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) {
-            return self::output2( $post );
+        if (apply_filters('getpaid_use_new_invoice_items_metabox', false)) {
+            return self::output2($post);
         }
 
-        $post_id            = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice            = $invoice instanceof WPInv_Invoice ? $invoice : new WPInv_Invoice( $post_id );
+        $post_id            = !empty($post->ID) ? $post->ID : 0;
+        $invoice            = $invoice instanceof WPInv_Invoice ? $invoice : new WPInv_Invoice($post_id);
         $use_taxes          = $invoice->is_taxable() && wpinv_use_taxes();
-        $item_types         = apply_filters( 'wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post );
-        $columns            = self::get_columns( $invoice );
-        $cols               = count( $columns );
+        $item_types         = apply_filters('wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post);
+        $columns            = self::get_columns($invoice);
+        $cols               = count($columns);
         $class              = '';
 
-        unset( $item_types['adv'] );
-        unset( $item_types['package'] );
+        unset($item_types['adv']);
+        unset($item_types['package']);
 
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             $class .= ' wpinv-paid';
         }
 
-        if ( $invoice->is_refunded() ) {
+        if ($invoice->is_refunded()) {
             $class .= ' wpinv-refunded';
         }
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $class .= ' wpi-recurring';
         }
 
     ?>
 
-        <div class="wpinv-items-wrap<?php echo $class; ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr( $invoice->get_status() ); ?>">
+        <div class="wpinv-items-wrap<?php echo $class; ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr($invoice->get_status()); ?>">
             <table id="wpinv_items" class="wpinv-items" cellspacing="0" cellpadding="0">
 
                 <thead>
                     <tr>
-                        <?php foreach ( $columns as $key => $label ) : ?>
-                            <th class="<?php echo esc_attr( $key ); echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : '' ?>"><?php echo wp_kses_post( $label ); ?></th>
+                        <?php foreach ($columns as $key => $label) : ?>
+                            <th class="<?php echo esc_attr($key); echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : '' ?>"><?php echo wp_kses_post($label); ?></th>
                         <?php endforeach; ?>
                     </tr>
                 </thead>
 
                 <tbody class="wpinv-line-items">
                     <?php
-                        foreach ( $invoice->get_items() as $int => $item ) {
-                            self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' );
+                        foreach ($invoice->get_items() as $int => $item) {
+                            self::output_row($columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd');
                         }
                     ?>
                 </tbody>
@@ -108,7 +108,7 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-name">
                                                     <span class="input-text-wrap">
-                                                        <input type="text" style="width: 100%" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' );?>" class="wpinv-quick-item-name" name="_wpinv_quick[name]">
+                                                        <input type="text" style="width: 100%" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="wpinv-quick-item-name" name="_wpinv_quick[name]">
                                                     </span>
                                                 </label>
                                             </div>
@@ -116,8 +116,8 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-price">
                                                     <span class="input-text-wrap">
-                                                    <input type="text" style="width: 200px" placeholder="<?php esc_attr_e( 'Item Price', 'invoicing' );?>" class="wpinv-quick-item-price" name="_wpinv_quick[price]">
-                                                        &times; <input type="text" style="width: 140px" placeholder="<?php esc_attr_e( 'Item Quantity', 'invoicing' );?>" class="wpinv-quick-item-qty" name="_wpinv_quick[qty]">
+                                                    <input type="text" style="width: 200px" placeholder="<?php esc_attr_e('Item Price', 'invoicing'); ?>" class="wpinv-quick-item-price" name="_wpinv_quick[price]">
+                                                        &times; <input type="text" style="width: 140px" placeholder="<?php esc_attr_e('Item Quantity', 'invoicing'); ?>" class="wpinv-quick-item-qty" name="_wpinv_quick[qty]">
                                                     </span>
                                                 </label>
                                             </div>
@@ -125,7 +125,7 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-name">
                                                     <span class="input-text-wrap">
-                                                        <textarea rows="4" style="width: 100%" placeholder="<?php esc_attr_e( 'Item Description', 'invoicing' );?>" class="wpinv-quick-item-description" name="_wpinv_quick[description]"></textarea>
+                                                        <textarea rows="4" style="width: 100%" placeholder="<?php esc_attr_e('Item Description', 'invoicing'); ?>" class="wpinv-quick-item-description" name="_wpinv_quick[description]"></textarea>
                                                     </span>
                                                 </label>
                                             </div>
@@ -133,7 +133,7 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-type">
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $item_types,
                                                             'name'             => '_wpinv_quick[type]',
                                                             'id'               => '_wpinv_quick_type',
@@ -141,19 +141,19 @@ 
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-type',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
 
-                                            <?php if ( $use_taxes ) : ?>
+                                            <?php if ($use_taxes) : ?>
                                                 <div class="wp-clearfix">
                                                     <label class="wpi-vat-rule">
                                                         <span class="input-text-wrap">
                                                             <?php
-                                                                echo wpinv_html_select( array(
+                                                                echo wpinv_html_select(array(
                                                                     'options'          => array_merge(
-                                                                        array( '' => __( 'Select VAT Rule', 'invoicing' ) ),
+                                                                        array('' => __('Select VAT Rule', 'invoicing')),
                                                                         getpaid_get_tax_rules()
                                                                     ),
                                                                     'name'             => '_wpinv_quick[vat_rule]',
@@ -161,7 +161,7 @@ 
                                                                     'show_option_all'  => false,
                                                                     'show_option_none' => false,
                                                                     'class'            => 'gdmbx2-text-medium wpinv-quick-vat-rule',
-                                                                ) );
+                                                                ));
                                                             ?>
                                                         </span>
                                                     </label>
@@ -170,9 +170,9 @@ 
                                                     <label class="wpi-vat-class">
                                                         <span class="input-text-wrap">
                                                             <?php
-                                                                echo wpinv_html_select( array(
+                                                                echo wpinv_html_select(array(
                                                                     'options'          => array_merge(
-                                                                        array( '' => __( 'Select VAT Class', 'invoicing' ) ),
+                                                                        array('' => __('Select VAT Class', 'invoicing')),
                                                                         getpaid_get_tax_classes()
                                                                     ),
                                                                     'name'             => '_wpinv_quick[vat_class]',
@@ -180,7 +180,7 @@ 
                                                                     'show_option_all'  => false,
                                                                     'show_option_none' => false,
                                                                     'class'            => 'gdmbx2-text-medium wpinv-quick-vat-class',
-                                                                ) );
+                                                                ));
                                                             ?>
                                                         </span>
                                                     </label>
@@ -201,29 +201,29 @@ 
                         </td>
                     </tr>
                     <tr class="totals">
-                        <td colspan="<?php echo ( $cols - 4 ); ?>"></td>
+                        <td colspan="<?php echo ($cols - 4); ?>"></td>
                         <td colspan="4">
                             <table cellspacing="0" cellpadding="0">
                                 <tr class="subtotal">
-                                    <td class="name"><?php _e( 'Sub Total:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo wpinv_price( $invoice->get_subtotal(), $invoice->get_currency() );?></td>
+                                    <td class="name"><?php _e('Sub Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo wpinv_price($invoice->get_subtotal(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <tr class="discount">
-                                    <td class="name"><?php _e( 'Discount:', 'invoicing' ) ; ?></td>
-                                    <td class="total"><?php echo wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() );?></td>
+                                    <td class="name"><?php _e('Discount:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo wpinv_price($invoice->get_total_discount(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
-                                <?php if ( $use_taxes ) : ?>
+                                <?php if ($use_taxes) : ?>
                                 <tr class="tax">
-                                    <td class="name"><?php _e( 'Tax:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo wpinv_price( $invoice->get_total_tax(), $invoice->get_currency() );?></td>
+                                    <td class="name"><?php _e('Tax:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo wpinv_price($invoice->get_total_tax(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php endif; ?>
                                 <tr class="total">
-                                    <td class="name"><?php _e( 'Total:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo wpinv_price( $invoice->get_total(), $invoice->get_currency() );?></td>
+                                    <td class="name"><?php _e('Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo wpinv_price($invoice->get_total(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                             </table>
@@ -234,7 +234,7 @@ 
             </table>
             <div class="wpinv-actions">
                 <?php
-                    if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+                    if (!$invoice->is_paid() && !$invoice->is_refunded()) {
                         echo wpinv_item_dropdown(
                             array(
                                 'name'             => 'wpinv_invoice_item',
@@ -244,61 +244,61 @@ 
                             )
                         );
 
-                        echo "&nbsp;" . '<button class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), $invoice->get_label() ) . '</button>';
-                        echo "&nbsp;" . '<button class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>';
-                        echo "&nbsp;" . '<button class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>';
+                        echo "&nbsp;" . '<button class="button button-primary" id="wpinv-add-item">' . sprintf(esc_html__('Add item to %s', 'invoicing'), $invoice->get_label()) . '</button>';
+                        echo "&nbsp;" . '<button class="button button-primary" id="wpinv-new-item">' . esc_html__('Create new item', 'invoicing') . '</button>';
+                        echo "&nbsp;" . '<button class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__('Recalculate Totals', 'invoicing') . '</button>';
 
                     }
                 ?>
-                <?php do_action( 'wpinv_invoice_items_actions', $invoice ); ?>
+                <?php do_action('wpinv_invoice_items_actions', $invoice); ?>
             </div>
         </div>
         <?php
     }
 
-    public static function output_row( $columns, $item, $invoice, $class='even' ) {
+    public static function output_row($columns, $item, $invoice, $class = 'even') {
 
     ?>
-        <tr class="item item-<?php echo esc_attr( $class ); ?>" data-item-id="<?php echo esc_attr( $item->get_id() ); ?>">
-            <?php foreach ( array_keys( $columns ) as $column ) : ?>
-                <td class="<?php echo esc_attr( $column ); echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : '' ?>">
+        <tr class="item item-<?php echo esc_attr($class); ?>" data-item-id="<?php echo esc_attr($item->get_id()); ?>">
+            <?php foreach (array_keys($columns) as $column) : ?>
+                <td class="<?php echo esc_attr($column); echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : '' ?>">
                     <?php
-                        switch ( $column ) {
+                        switch ($column) {
                             case 'id':
                                 echo (int) $item->get_id();
                                 break;
                             case 'title':
                                 printf(
                                     '<a href="%s" target="_blank">%s</a>',
-                                    get_edit_post_link( $item->get_id() ),
-                                    esc_html( $item->get_raw_name() )
+                                    get_edit_post_link($item->get_id()),
+                                    esc_html($item->get_raw_name())
                                 );
 
-                                $summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice );
-                                if ( $summary !== '' ) {
+                                $summary = apply_filters('getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice);
+                                if ($summary !== '') {
                                     printf(
                                         '<span class="meta">%s</span>',
-                                        wpautop( wp_kses_post( $summary ) )
+                                        wpautop(wp_kses_post($summary))
                                     );
                                 }
 
                                 printf(
                                     '<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />',
-                                    esc_attr( $item->get_raw_name() ),
+                                    esc_attr($item->get_raw_name()),
                                     (int) $item->get_id()
                                 );
 
                                 printf(
                                     '<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>',
                                     (int) $item->get_id(),
-                                    esc_attr( $item->get_description() )
+                                    esc_attr($item->get_description())
                                 );
 
                                 break;
                             case 'price':
                                 printf(
                                     '<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />',
-                                    esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ),
+                                    esc_attr(getpaid_unstandardize_amount($item->get_price())),
                                     (int) $item->get_id()
                                 );
 
@@ -306,26 +306,26 @@ 
                             case 'qty':
                                 printf(
                                     '<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />',
-                                    floatval( $item->get_quantity() ),
+                                    floatval($item->get_quantity()),
                                     (int) $item->get_id()
                                 );
 
                                 break;
                             case 'total':
-                                echo wpinv_price( $item->get_sub_total(), $invoice->get_currency() );
+                                echo wpinv_price($item->get_sub_total(), $invoice->get_currency());
 
                                 break;
                             case 'tax':
-                                echo wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) . '%';
+                                echo wpinv_round_amount(getpaid_get_invoice_tax_rate($invoice, $item), 2) . '%';
 
                                 break;
                             case 'action':
-                                if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+                                if (!$invoice->is_paid() && !$invoice->is_refunded()) {
                                     echo '<i class="fa fa-trash wpinv-item-remove"></i>';
                                 }
                                 break;
                         }
-                        do_action( 'getpaid_admin_edit_invoice_item_' . $column, $item, $invoice );
+                        do_action('getpaid_admin_edit_invoice_item_' . $column, $item, $invoice);
                     ?>
                 </td>
             <?php endforeach; ?>
@@ -338,10 +338,10 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output2( $post ) {
+    public static function output2($post) {
 
         // Prepare the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Invoice items.
         $items = $invoice->get_items();
@@ -349,28 +349,28 @@ 
         $totals = array(
 
             'subtotal'  => array(
-                'label' => __( 'Items Subtotal', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_subtotal(), $invoice->get_currency() ),
+                'label' => __('Items Subtotal', 'invoicing'),
+                'value' => wpinv_price($invoice->get_subtotal(), $invoice->get_currency()),
             ),
 
             'discount'  => array(
-                'label' => __( 'Total Discount', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() ),
+                'label' => __('Total Discount', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_discount(), $invoice->get_currency()),
             ),
 
             'tax'       => array(
-                'label' => __( 'Total Tax', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_tax(), $invoice->get_currency() ),
+                'label' => __('Total Tax', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_tax(), $invoice->get_currency()),
             ),
 
             'total'     => array(
-                'label' => __( 'Invoice Total', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+                'label' => __('Invoice Total', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
             )
         );
 
-        if ( ! wpinv_use_taxes() ) {
-            unset( $totals['tax'] );
+        if (!wpinv_use_taxes()) {
+            unset($totals['tax']);
         }
 
         $item_args = array(
@@ -378,7 +378,7 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'meta_query'     => array(
                 array(
                     'key'       => '_wpinv_type',
@@ -402,10 +402,10 @@ 
             }
         </style>
 
-                <div class="bsui getpaid-invoice-items-inner <?php echo empty( $items ) ? 'no-items' : 'has-items'; ?> <?php echo $invoice->is_paid() || $invoice->is_refunded() ? 'not-editable' : 'editable'; ?>" style="margin-top: 1.5rem; padding: 0 12px 12px;">
+                <div class="bsui getpaid-invoice-items-inner <?php echo empty($items) ? 'no-items' : 'has-items'; ?> <?php echo $invoice->is_paid() || $invoice->is_refunded() ? 'not-editable' : 'editable'; ?>" style="margin-top: 1.5rem; padding: 0 12px 12px;">
 
-                    <?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
-                        <?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
+                    <?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
+                        <?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
 
                         <div class="row">
                             <div class="col-12 col-sm-6">
@@ -414,15 +414,15 @@ 
                                         array(
                                             'id'          => 'wpinv_template',
                                             'name'        => 'wpinv_template',
-                                            'label'       => __( 'Template', 'invoicing' ),
+                                            'label'       => __('Template', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Choose a template', 'invoicing' ),
+                                            'placeholder' => __('Choose a template', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_template( 'edit' ),
+                                            'value'       => $invoice->get_template('edit'),
                                             'options'     => array(
-                                                'quantity' => __( 'Quantity', 'invoicing' ),
-                                                'hours'    => __( 'Hours', 'invoicing' ),
-                                                'amount'   => __( 'Amount Only', 'invoicing' ),
+                                                'quantity' => __('Quantity', 'invoicing'),
+                                                'hours'    => __('Hours', 'invoicing'),
+                                                'amount'   => __('Amount Only', 'invoicing'),
                                             ),
                                             'data-allow-clear' => 'false',
                                             'select2'          => true,
@@ -438,11 +438,11 @@ 
                                         array(
                                             'id'          => 'wpinv_currency',
                                             'name'        => 'wpinv_currency',
-                                            'label'       => __( 'Currency', 'invoicing' ),
+                                            'label'       => __('Currency', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+                                            'placeholder' => __('Select Invoice Currency', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_currency( 'edit' ),
+                                            'value'       => $invoice->get_currency('edit'),
                                             'required'    => false,
                                             'data-allow-clear' => 'false',
                                             'select2'          => true,
@@ -454,24 +454,24 @@ 
                             </div>
                         </div>
 
-                        <?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
+                        <?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
                     <?php endif; ?>
 
                     <table cellpadding="0" cellspacing="0" class="getpaid_invoice_items">
                         <thead>
                             <tr>
-                                <th class="getpaid-item" colspan="2"><?php _e( 'Item', 'invoicing' ) ?></th>
+                                <th class="getpaid-item" colspan="2"><?php _e('Item', 'invoicing') ?></th>
                                 <th class="getpaid-quantity hide-if-amount text-right">
-                                    <span class="getpaid-hide-if-hours"><?php _e( 'Quantity', 'invoicing' ) ?></span>
-                                    <span class="getpaid-hide-if-quantity"><?php _e( 'Hours', 'invoicing' ) ?></span>
+                                    <span class="getpaid-hide-if-hours"><?php _e('Quantity', 'invoicing') ?></span>
+                                    <span class="getpaid-hide-if-quantity"><?php _e('Hours', 'invoicing') ?></span>
                                 </th>
                                 <th class="getpaid-price hide-if-amount text-right">
-                                    <span class="getpaid-hide-if-hours"><?php _e( 'Price', 'invoicing' ) ?></span>
-                                    <span class="getpaid-hide-if-quantity"><?php _e( 'Rate', 'invoicing' ) ?></span>
+                                    <span class="getpaid-hide-if-hours"><?php _e('Price', 'invoicing') ?></span>
+                                    <span class="getpaid-hide-if-quantity"><?php _e('Rate', 'invoicing') ?></span>
                                 </th>
                                 <th class="getpaid-item-subtotal text-right">
-                                    <span class="getpaid-hide-if-hours getpaid-hide-if-quantity"><?php _e( 'Amount', 'invoicing' ) ?></span>
-                                    <span class="hide-if-amount"><?php _e( 'Total', 'invoicing' ) ?></span>
+                                    <span class="getpaid-hide-if-hours getpaid-hide-if-quantity"><?php _e('Amount', 'invoicing') ?></span>
+                                    <span class="hide-if-amount"><?php _e('Total', 'invoicing') ?></span>
                                 </th>
                                 <th class="getpaid-item-actions hide-if-not-editable" width="70px">&nbsp;</th>
                             </tr>
@@ -479,8 +479,8 @@ 
 		                <tbody class="getpaid_invoice_line_items">
                             <tr class="hide-if-has-items hide-if-not-editable">
                                 <td colspan="2" class="pt-4 pb-4">
-                                    <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php _e( 'Add Existing Items', 'invoicing' ) ?></button>
-                                    <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php _e( 'Create New Item', 'invoicing' ) ?></button>
+                                    <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php _e('Add Existing Items', 'invoicing') ?></button>
+                                    <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php _e('Create New Item', 'invoicing') ?></button>
                                 </td>
                                 <td class="hide-if-amount">&nbsp;</th>
                                 <td class="hide-if-amount">&nbsp;</th>
@@ -512,11 +512,11 @@ 
                             <div class="col-12 col-sm-6 offset-sm-6">
                                 <table class="getpaid-invoice-totals text-right w-100">
                                     <tbody>
-                                        <?php foreach ( apply_filters( 'getpaid_invoice_subtotal_rows', $totals, $invoice ) as $key => $data ) : ?>
-                                            <tr class="getpaid-totals-<?php echo sanitize_html_class( $key ); ?>">
-                                                <td class="label"><?php echo esc_html( $data['label'] ) ?>:</td>
+                                        <?php foreach (apply_filters('getpaid_invoice_subtotal_rows', $totals, $invoice) as $key => $data) : ?>
+                                            <tr class="getpaid-totals-<?php echo sanitize_html_class($key); ?>">
+                                                <td class="label"><?php echo esc_html($data['label']) ?>:</td>
                                                 <td width="1%"></td>
-                                                <td class="value"><?php echo wp_kses_post( $data['value'] ) ?></td>
+                                                <td class="value"><?php echo wp_kses_post($data['value']) ?></td>
                                             </tr>
                                         <?php endforeach; ?>
                                     </tbody>
@@ -529,18 +529,18 @@ 
                     <div class="getpaid-invoice-item-actions hide-if-no-items hide-if-not-editable">
                         <div class="row">
                             <div class="text-left col-12 col-sm-8">
-                                <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php _e( 'Add Existing Item', 'invoicing' ) ?></button>
-                                <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php _e( 'Create New Item', 'invoicing' ) ?></button>
-                                <?php do_action( 'getpaid-invoice-items-actions', $invoice ); ?>
+                                <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php _e('Add Existing Item', 'invoicing') ?></button>
+                                <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php _e('Create New Item', 'invoicing') ?></button>
+                                <?php do_action('getpaid-invoice-items-actions', $invoice); ?>
                             </div>
                             <div class="text-right col-12 col-sm-4">
-                                <button type="button" class="button button-primary recalculate-totals-button"><?php _e( 'Recalculate Totals', 'invoicing' ) ?></button>
+                                <button type="button" class="button button-primary recalculate-totals-button"><?php _e('Recalculate Totals', 'invoicing') ?></button>
                             </div>
                         </div>
                     </div>
 
                     <div class="getpaid-invoice-item-actions hide-if-editable">
-                        <p class="description m-2 text-right text-muted"><?php _e( 'This invoice is no longer editable', 'invoicing' ); ?></p>
+                        <p class="description m-2 text-right text-muted"><?php _e('This invoice is no longer editable', 'invoicing'); ?></p>
                     </div>
 
                     <!-- Add items to an invoice -->
@@ -548,8 +548,8 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-add-item-to-invoice-label"><?php _e( "Add Item(s)", 'invoicing' ); ?></h5>
-                                    <button type="button" class="close" data-dismiss="modal" aria-label="<?php _e( "Close", 'invoicing' ); ?>">
+                                    <h5 class="modal-title" id="getpaid-add-item-to-invoice-label"><?php _e("Add Item(s)", 'invoicing'); ?></h5>
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="<?php _e("Close", 'invoicing'); ?>">
                                         <span aria-hidden="true">&times;</span>
                                     </button>
                                 </div>
@@ -557,10 +557,10 @@ 
                                     <table class="widefat">
                                         <thead>
                                             <tr>
-                                                <th class="pl-0 text-left"><?php _e( 'Item', 'invoicing' ) ?></th>
+                                                <th class="pl-0 text-left"><?php _e('Item', 'invoicing') ?></th>
                                                 <th class="pr-0 text-right hide-if-amount">
-                                                    <span class="getpaid-hide-if-hours"><?php _e( 'Quantity', 'invoicing' ) ?></span>
-                                                    <span class="getpaid-hide-if-quantity"><?php _e( 'Hours', 'invoicing' ) ?></span>
+                                                    <span class="getpaid-hide-if-hours"><?php _e('Quantity', 'invoicing') ?></span>
+                                                    <span class="getpaid-hide-if-quantity"><?php _e('Hours', 'invoicing') ?></span>
                                                 </th>
                                             </tr>
                                         </thead>
@@ -568,9 +568,9 @@ 
 								            <tr>
 									            <td class="pl-0 text-left">
                                                     <select class="regular-text getpaid-add-invoice-item-select">
-                                                        <option value="" selected="selected" disabled><?php esc_html_e( 'Select an item…', 'invoicing' ); ?></option>
-                                                        <?php foreach ( get_posts( $item_args ) as $item ) : ?>
-                                                        <option value="<?php echo (int) $item->ID; ?>"><?php echo strip_tags( $item->post_title ); ?></option>
+                                                        <option value="" selected="selected" disabled><?php esc_html_e('Select an item…', 'invoicing'); ?></option>
+                                                        <?php foreach (get_posts($item_args) as $item) : ?>
+                                                        <option value="<?php echo (int) $item->ID; ?>"><?php echo strip_tags($item->post_title); ?></option>
                                                         <?php endforeach; ?>
                                                     </select>
                                                 </td>
@@ -582,8 +582,8 @@ 
 						            </table>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php _e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-add" data-dismiss="modal"><?php _e( 'Add', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php _e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-add" data-dismiss="modal"><?php _e('Add', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -594,8 +594,8 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-create-invoice-item-label"><?php _e( "Create Item", 'invoicing' ); ?></h5>
-                                    <button type="button" class="close" data-dismiss="modal" aria-label="<?php _e( "Close", 'invoicing' ); ?>">
+                                    <h5 class="modal-title" id="getpaid-create-invoice-item-label"><?php _e("Create Item", 'invoicing'); ?></h5>
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="<?php _e("Close", 'invoicing'); ?>">
                                         <span aria-hidden="true">&times;</span>
                                     </button>
                                 </div>
@@ -603,27 +603,27 @@ 
                                     <div class="getpaid-create-item-div">
                                         <input type="hidden" name="id" value="new" class="form-control form-control-sm item-id">
                                         <label class="form-group w-100">
-                                            <span><?php _e( 'Name', 'invoicing' ); ?></span>
-                                            <input type="text" name="name" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="form-control form-control-sm item-name">
+                                            <span><?php _e('Name', 'invoicing'); ?></span>
+                                            <input type="text" name="name" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="form-control form-control-sm item-name">
                                         </label>
                                         <label class="form-group w-100">
-                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php _e( 'Amount', 'invoicing' ); ?></span>
-                                            <span class="hide-if-amount"><?php _e( 'Price', 'invoicing' ); ?></span>
-                                            <input type="text" name="price" placeholder="<?php echo wpinv_sanitize_amount( 0 ); ?>" class="form-control form-control-sm item-price">
+                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php _e('Amount', 'invoicing'); ?></span>
+                                            <span class="hide-if-amount"><?php _e('Price', 'invoicing'); ?></span>
+                                            <input type="text" name="price" placeholder="<?php echo wpinv_sanitize_amount(0); ?>" class="form-control form-control-sm item-price">
                                         </label>
                                         <label class="form-group w-100 hide-if-amount">
-                                            <span><?php _e( 'Quantity', 'invoicing' ); ?></span>
+                                            <span><?php _e('Quantity', 'invoicing'); ?></span>
                                             <input type="text" name="quantity" placeholder="1" class="form-control form-control-sm item-quantity">
                                         </label>
                                         <label class="form-group w-100">
-                                            <span><?php _e( 'Item Description', 'invoicing' ); ?></span>
-                                            <textarea name="description" placeholder="<?php esc_attr_e( 'Enter a description for this item', 'invoicing' ); ?>" class="form-control item-description"></textarea>
+                                            <span><?php _e('Item Description', 'invoicing'); ?></span>
+                                            <textarea name="description" placeholder="<?php esc_attr_e('Enter a description for this item', 'invoicing'); ?>" class="form-control item-description"></textarea>
                                         </label>
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php _e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php _e( 'Create', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php _e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php _e('Create', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -634,8 +634,8 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-edit-invoice-item-label"><?php _e( "Edit Item", 'invoicing' ); ?></h5>
-                                    <button type="button" class="close" data-dismiss="modal" aria-label="<?php _e( "Close", 'invoicing' ); ?>">
+                                    <h5 class="modal-title" id="getpaid-edit-invoice-item-label"><?php _e("Edit Item", 'invoicing'); ?></h5>
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="<?php _e("Close", 'invoicing'); ?>">
                                         <span aria-hidden="true">&times;</span>
                                     </button>
                                 </div>
@@ -643,27 +643,27 @@ 
                                     <div class="getpaid-edit-item-div">
                                         <input type="hidden" name="id" class="form-control form-control-sm item-id">
                                         <label class="form-group w-100">
-                                            <span><?php _e( 'Name', 'invoicing' ); ?></span>
-                                            <input type="text" name="name" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="form-control form-control-sm item-name">
+                                            <span><?php _e('Name', 'invoicing'); ?></span>
+                                            <input type="text" name="name" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="form-control form-control-sm item-name">
                                         </label>
                                         <label class="form-group w-100">
-                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php _e( 'Amount', 'invoicing' ); ?></span>
-                                            <span class="hide-if-amount"><?php _e( 'Price', 'invoicing' ); ?></span>
-                                            <input type="text" name="price" placeholder="<?php wpinv_sanitize_amount( 0 ); ?>" class="form-control form-control-sm item-price">
+                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php _e('Amount', 'invoicing'); ?></span>
+                                            <span class="hide-if-amount"><?php _e('Price', 'invoicing'); ?></span>
+                                            <input type="text" name="price" placeholder="<?php wpinv_sanitize_amount(0); ?>" class="form-control form-control-sm item-price">
                                         </label>
                                         <label class="form-group w-100 hide-if-amount">
-                                            <span><?php _e( 'Quantity', 'invoicing' ); ?></span>
+                                            <span><?php _e('Quantity', 'invoicing'); ?></span>
                                             <input type="text" name="quantity" placeholder="1" class="form-control form-control-sm item-quantity">
                                         </label>
                                         <label class="form-group w-100">
-                                            <span><?php _e( 'Item Description', 'invoicing' ); ?></span>
-                                            <textarea name="description" placeholder="<?php esc_attr_e( 'Enter a description for this item', 'invoicing' ); ?>" class="form-control item-description"></textarea>
+                                            <span><?php _e('Item Description', 'invoicing'); ?></span>
+                                            <textarea name="description" placeholder="<?php esc_attr_e('Enter a description for this item', 'invoicing'); ?>" class="form-control item-description"></textarea>
                                         </label>
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php _e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php _e( 'Save', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php _e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php _e('Save', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>