AyeCode / invoicing

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

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

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

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

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

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

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

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

includes/class-wpinv.php

Spacing +165 added lines, -165 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Invoicing class.
@@ -63,8 +63,8 @@ 
 	 * @param string $prop The prop to set.
 	 * @param mixed $value The value to retrieve.
 	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
+	public function set($prop, $value) {
+		$this->data[$prop] = $value;
 	}
 
 	/**
@@ -73,10 +73,10 @@ 
 	 * @param string $prop The prop to set.
 	 * @return mixed The value.
 	 */
-	public function get( $prop ) {
+	public function get($prop) {
 
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
+		if (isset($this->data[$prop])) {
+			return $this->data[$prop];
 		}
 
 		return null;
@@ -88,25 +88,25 @@ 
 	public function set_properties() {
 
 		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+		$this->set('session', new WPInv_Session_Handler());
+		$GLOBALS['wpi_session'] = $this->get('session'); // Backwards compatibility.
 		$this->tax              = new WPInv_EUVat();
 		$this->tax->init();
 		$GLOBALS['wpinv_euvat'] = $this->tax; // Backwards compatibility.
 
 		// Init other objects.
-		$this->set( 'reports', new WPInv_Reports() ); // TODO: Refactor.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
+		$this->set('reports', new WPInv_Reports()); // TODO: Refactor.
+		$this->set('session', new WPInv_Session_Handler());
+		$this->set('notes', new WPInv_Notes());
+		$this->set('api', new WPInv_API());
+		$this->set('post_types', new GetPaid_Post_Types());
+		$this->set('template', new GetPaid_Template());
+		$this->set('admin', new GetPaid_Admin());
+		$this->set('subscriptions', new WPInv_Subscriptions());
+		$this->set('invoice_emails', new GetPaid_Invoice_Notification_Emails());
+		$this->set('subscription_emails', new GetPaid_Subscription_Notification_Emails());
+		$this->set('daily_maintenace', new GetPaid_Daily_Maintenance());
+		$this->set('payment_forms', new GetPaid_Payment_Forms());
 
 	}
 
@@ -114,8 +114,8 @@ 
 	 * Define plugin constants.
 	 */
 	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+		define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+		define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
 		$this->version = WPINV_VERSION;
 	}
 
@@ -126,27 +126,27 @@ 
 	 */
 	protected function init_hooks() {
 		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+		add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
 
 		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'getpaid_init', array( $this, 'maybe_process_ipn' ), 5 );
-		add_action( 'init', array( &$this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+		add_action('init', array($this, 'init'), 1);
+		add_action('getpaid_init', array($this, 'maybe_process_ipn'), 5);
+		add_action('init', array(&$this, 'wpinv_actions'));
+		add_action('init', array($this, 'maybe_do_authenticated_action'), 100);
 
-		if ( class_exists( 'BuddyPress' ) ) {
-			add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+		if (class_exists('BuddyPress')) {
+			add_action('bp_include', array(&$this, 'bp_invoicing_init'));
 		}
 
-		add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
-		add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
-		add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+		add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
+		add_action('wp_footer', array(&$this, 'wp_footer'));
+		add_action('widgets_init', array(&$this, 'register_widgets'));
+		add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
+		add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
 
 		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
+		do_action('wpinv_actions', $this);
+		do_action('getpaid_actions', $this);
 
 	}
 
@@ -154,10 +154,10 @@ 
 		/* Internationalize the text strings used. */
 		$this->load_textdomain();
 
-		do_action( 'wpinv_loaded' );
+		do_action('wpinv_loaded');
 
 		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
+		if (function_exists('ct_css_output')) {
 			wpinv_oxygen_fix_conflict();
 		}
 	}
@@ -167,21 +167,21 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function load_textdomain( $locale = NULL ) {
-		if ( empty( $locale ) ) {
-			$locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+	public function load_textdomain($locale = NULL) {
+		if (empty($locale)) {
+			$locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
 		}
 
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+		$locale = apply_filters('plugin_locale', $locale, 'invoicing');
 
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+		unload_textdomain('invoicing');
+		load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+		load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
 
 		/**
 		 * Define language constants.
 		 */
-		require_once( WPINV_PLUGIN_DIR . 'language.php' );
+		require_once(WPINV_PLUGIN_DIR . 'language.php');
 	}
 
 	/**
@@ -190,90 +190,90 @@ 
 	public function includes() {
 
 		// Start with the settings.
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
 
 		// Packages/libraries.
-		require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-		require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+		require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+		require_once(WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php');
 
 		// Load functions.
-		require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/invoice-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/subscription-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/error-functions.php');
 
 		// Register autoloader.
 		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+			spl_autoload_register(array($this, 'autoload'), true);
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), '', __FILE__, 149, true);
 		}
 
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/getpaid.php');
 
 		/**
 		 * Load the tax class.
 		 */
-		if ( ! class_exists( 'WPInv_EUVat' ) ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+		if (!class_exists('WPInv_EUVat')) {
+			require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
 		}
 
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+		if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 			GetPaid_Post_Types_Admin::init();
 
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php');
 			// load the user class only on the users.php page
 			global $pagenow;
-			if($pagenow=='users.php'){
+			if ($pagenow == 'users.php') {
 				new WPInv_Admin_Users();
 			}
 		}
 
 		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+		if (defined('WP_CLI') && WP_CLI) {
+			require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+			WP_CLI::add_command('invoicing', 'WPInv_CLI');
 		}
 
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
 	}
 
 	/**
@@ -284,21 +284,21 @@ 
 	 * @since       1.0.19
 	 * @return      void
 	 */
-	public function autoload( $class_name ) {
+	public function autoload($class_name) {
 
 		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
+		$class_name = strtolower($class_name);
 
 		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+		if (false === strpos($class_name, 'getpaid_') && false === strpos($class_name, 'wpinv_')) {
 			return;
 		}
 
 		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+		$file_name = 'class-' . str_replace('_', '-', $class_name) . '.php';
 
 		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+		$plugin_path = untrailingslashit(WPINV_PLUGIN_DIR);
 
 		// And an array of possible locations in order of importance.
 		$locations = array(
@@ -310,10 +310,10 @@ 
 			"$plugin_path/includes/admin/meta-boxes",
 		);
 
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+		foreach (apply_filters('getpaid_autoload_locations', $locations) as $location) {
 
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
+			if (file_exists(trailingslashit($location) . $file_name)) {
+				include trailingslashit($location) . $file_name;
 				break;
 			}
 
@@ -327,7 +327,7 @@ 
 	public function init() {
 
 		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
+		do_action('before_getpaid_init', $this);
 
 		// Load default gateways.
 		$gateways = apply_filters(
@@ -341,12 +341,12 @@ 
 			)
 		);
 
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
+		foreach ($gateways as $id => $class) {
+			$this->gateways[$id] = new $class();
 		}
 
 		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
+		do_action('getpaid_init', $this);
 
 	}
 
@@ -356,69 +356,69 @@ 
 	public function maybe_process_ipn() {
 
 		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+		if (empty($_GET['wpi-listener']) || 'IPN' !== $_GET['wpi-listener'] || empty($_GET['wpi-gateway'])) {
 			return;
 		}
 
-		$gateway = wpinv_clean( $_GET['wpi-gateway'] );
+		$gateway = wpinv_clean($_GET['wpi-gateway']);
 
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
+		do_action('wpinv_verify_payment_ipn', $gateway);
+		do_action("wpinv_verify_{$gateway}_ipn");
 		exit;
 
 	}
 
 	public function enqueue_scripts() {
-		$suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
-		wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
-		wp_enqueue_style( 'wpinv_front_style' );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css');
+		wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version);
+		wp_enqueue_style('wpinv_front_style');
 
 		// Register scripts
-		wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-		wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ) );
+		wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+		wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), filemtime(WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js'));
 
 		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+		$localize['ajax_url']             = admin_url('admin-ajax.php');
+		$localize['nonce']                = wp_create_nonce('wpinv-nonce');
 		$localize['currency_symbol']      = wpinv_currency_symbol();
 		$localize['currency_pos']         = wpinv_currency_position();
 		$localize['thousand_sep']         = wpinv_thousands_separator();
 		$localize['decimal_sep']          = wpinv_decimal_separator();
 		$localize['decimals']             = wpinv_decimals();
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
+		$localize['txtComplete']          = __('Continue', 'invoicing');
 		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+		$localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
+		$localize['formNonce']            = wp_create_nonce('getpaid_form_nonce');
+		$localize['connectionError']      = __('Could not establish a connection to the server.', 'invoicing');
 
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
+		$localize = apply_filters('wpinv_front_js_localize', $localize);
 
-		wp_enqueue_script( 'jquery-blockui' );
+		wp_enqueue_script('jquery-blockui');
 		$autofill_api = wpinv_get_option('address_autofill_api');
 		$autofill_active = wpinv_get_option('address_autofill_active');
-		if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-			if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-				wp_dequeue_script( 'google-maps-api' );
+		if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
+			if (wp_script_is('google-maps-api', 'enqueued')) {
+				wp_dequeue_script('google-maps-api');
 			}
-			wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-			wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+			wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
+			wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
 		}
 
-		wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all' );
-		wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+		wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all');
+		wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-		wp_enqueue_script( 'wpinv-front-script' );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+		wp_enqueue_script('wpinv-front-script');
+		wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script', 'wp-hooks' ),  $version, true );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+		wp_enqueue_script('wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('wpinv-front-script', 'wp-hooks'), $version, true);
 	}
 
 	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+		if (isset($_REQUEST['wpi_action'])) {
+			do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
 		}
 	}
 
@@ -430,23 +430,23 @@ 
      */
     public function maybe_do_authenticated_action() {
 
-        if ( is_user_logged_in() && isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
-            $key = sanitize_key( $_REQUEST['getpaid-action'] );
-            do_action( "getpaid_authenticated_action_$key", $_REQUEST );
+        if (is_user_logged_in() && isset($_REQUEST['getpaid-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
+            $key = sanitize_key($_REQUEST['getpaid-action']);
+            do_action("getpaid_authenticated_action_$key", $_REQUEST);
         }
 
     }
 
-	public function pre_get_posts( $wp_query ) {
-		if ( ! is_admin() && !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+	public function pre_get_posts($wp_query) {
+		if (!is_admin() && !empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+			$wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
 		}
 
 		return $wp_query;
 	}
 
 	public function bp_invoicing_init() {
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
 	}
 
 	/**
@@ -467,8 +467,8 @@ 
 			)
 		);
 
-		foreach ( $widgets as $widget ) {
-			register_widget( $widget );
+		foreach ($widgets as $widget) {
+			register_widget($widget);
 		}
 		
 	}
@@ -479,10 +479,10 @@ 
 	 * @since 1.0.19
 	 * @param int[] $excluded_posts_ids
 	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+	public function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 
 		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
+		if (!is_array($excluded_posts_ids)) {
 			$excluded_posts_ids = array();
 		}
 
@@ -490,24 +490,24 @@ 
 		$our_pages = array();
 
 		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+		$our_pages[] = wpinv_get_option('checkout_page', false);
 
 		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+		$our_pages[] = wpinv_get_option('success_page', false);
 
 		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+		$our_pages[] = wpinv_get_option('failure_page', false);
 
 		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+		$our_pages[] = wpinv_get_option('invoice_history_page', false);
 
 		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+		$our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+		$our_pages   = array_map('intval', array_filter($our_pages));
 
 		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+		return array_unique($excluded_posts_ids);
 
 	}
 

Indentation +477 added lines, -477 removed lines

@@ -14,420 +14,420 @@ 
  */
 class WPInv_Plugin {
 
-	/**
-	 * GetPaid version.
-	 *
-	 * @var string
-	 */
-	public $version;
-
-	/**
-	 * Data container.
-	 *
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Form elements instance.
-	 *
-	 * @var WPInv_Payment_Form_Elements
-	 */
-	public $form_elements;
-
-	/**
-	 * Tax instance.
-	 *
-	 * @var WPInv_EUVat
-	 */
-	public $tax;
-
-	/**
-	 * @param array An array of payment gateways.
-	 */
-	public $gateways;
-
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-		$this->define_constants();
-		$this->includes();
-		$this->init_hooks();
-		$this->set_properties();
-	}
-
-	/**
-	 * Sets a custom data property.
-	 * 
-	 * @param string $prop The prop to set.
-	 * @param mixed $value The value to retrieve.
-	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
-	}
-
-	/**
-	 * Gets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @return mixed The value.
-	 */
-	public function get( $prop ) {
-
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Define class properties.
-	 */
-	public function set_properties() {
-
-		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
-		$this->tax              = new WPInv_EUVat();
-		$this->tax->init();
-		$GLOBALS['wpinv_euvat'] = $this->tax; // Backwards compatibility.
-
-		// Init other objects.
-		$this->set( 'reports', new WPInv_Reports() ); // TODO: Refactor.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-
-	}
-
-	 /**
-	 * Define plugin constants.
-	 */
-	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
-		$this->version = WPINV_VERSION;
-	}
-
-	/**
-	 * Hook into actions and filters.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function init_hooks() {
-		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
-
-		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'getpaid_init', array( $this, 'maybe_process_ipn' ), 5 );
-		add_action( 'init', array( &$this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-
-		if ( class_exists( 'BuddyPress' ) ) {
-			add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
-		}
-
-		add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
-		add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
-		add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
-
-	}
-
-	public function plugins_loaded() {
-		/* Internationalize the text strings used. */
-		$this->load_textdomain();
-
-		do_action( 'wpinv_loaded' );
-
-		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
-			wpinv_oxygen_fix_conflict();
-		}
-	}
-
-	/**
-	 * Load the translation of the plugin.
-	 *
-	 * @since 1.0
-	 */
-	public function load_textdomain( $locale = NULL ) {
-		if ( empty( $locale ) ) {
-			$locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
-		}
-
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
-
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
-
-		/**
-		 * Define language constants.
-		 */
-		require_once( WPINV_PLUGIN_DIR . 'language.php' );
-	}
-
-	/**
-	 * Include required core files used in admin and on the frontend.
-	 */
-	public function includes() {
-
-		// Start with the settings.
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
-
-		// Packages/libraries.
-		require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-		require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
-
-		// Load functions.
-		require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
-
-		// Register autoloader.
-		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
-		}
-
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
-
-		/**
-		 * Load the tax class.
-		 */
-		if ( ! class_exists( 'WPInv_EUVat' ) ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
-		}
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-			GetPaid_Post_Types_Admin::init();
-
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
-			// load the user class only on the users.php page
-			global $pagenow;
-			if($pagenow=='users.php'){
-				new WPInv_Admin_Users();
-			}
-		}
-
-		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
-		}
-
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
-	}
-
-	/**
-	 * Class autoloader
-	 *
-	 * @param       string $class_name The name of the class to load.
-	 * @access      public
-	 * @since       1.0.19
-	 * @return      void
-	 */
-	public function autoload( $class_name ) {
-
-		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
-
-		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
-			return;
-		}
-
-		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
-
-		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
-
-		// And an array of possible locations in order of importance.
-		$locations = array(
-			"$plugin_path/includes",
-			"$plugin_path/includes/data-stores",
-			"$plugin_path/includes/gateways",
-			"$plugin_path/includes/payments",
-			"$plugin_path/includes/api",
-			"$plugin_path/includes/admin",
-			"$plugin_path/includes/admin/meta-boxes",
-		);
-
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
-
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
-				break;
-			}
-
-		}
-
-	}
-
-	/**
-	 * Inits hooks etc.
-	 */
-	public function init() {
-
-		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
-
-		// Load default gateways.
-		$gateways = apply_filters(
-			'getpaid_default_gateways',
-			array(
-				'manual'        => 'GetPaid_Manual_Gateway',
-				'paypal'        => 'GetPaid_Paypal_Gateway',
-				'worldpay'      => 'GetPaid_Worldpay_Gateway',
-				'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
-				'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
-			)
-		);
-
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
-		}
-
-		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
-
-	}
-
-	/**
-	 * Checks if this is an IPN request and processes it.
-	 */
-	public function maybe_process_ipn() {
-
-		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
-			return;
-		}
-
-		$gateway = wpinv_clean( $_GET['wpi-gateway'] );
-
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
-		exit;
-
-	}
-
-	public function enqueue_scripts() {
-		$suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
-		wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
-		wp_enqueue_style( 'wpinv_front_style' );
-
-		// Register scripts
-		wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-		wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ) );
-
-		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['currency_symbol']      = wpinv_currency_symbol();
-		$localize['currency_pos']         = wpinv_currency_position();
-		$localize['thousand_sep']         = wpinv_thousands_separator();
-		$localize['decimal_sep']          = wpinv_decimal_separator();
-		$localize['decimals']             = wpinv_decimals();
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
-		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
-
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
-
-		wp_enqueue_script( 'jquery-blockui' );
-		$autofill_api = wpinv_get_option('address_autofill_api');
-		$autofill_active = wpinv_get_option('address_autofill_active');
-		if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-			if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-				wp_dequeue_script( 'google-maps-api' );
-			}
-			wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-			wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
-		}
-
-		wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all' );
-		wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
-
-		wp_enqueue_script( 'wpinv-front-script' );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script', 'wp-hooks' ),  $version, true );
-	}
-
-	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
-		}
-	}
-
-	/**
+    /**
+     * GetPaid version.
+     *
+     * @var string
+     */
+    public $version;
+
+    /**
+     * Data container.
+     *
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Form elements instance.
+     *
+     * @var WPInv_Payment_Form_Elements
+     */
+    public $form_elements;
+
+    /**
+     * Tax instance.
+     *
+     * @var WPInv_EUVat
+     */
+    public $tax;
+
+    /**
+     * @param array An array of payment gateways.
+     */
+    public $gateways;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+        $this->define_constants();
+        $this->includes();
+        $this->init_hooks();
+        $this->set_properties();
+    }
+
+    /**
+     * Sets a custom data property.
+     * 
+     * @param string $prop The prop to set.
+     * @param mixed $value The value to retrieve.
+     */
+    public function set( $prop, $value ) {
+        $this->data[ $prop ] = $value;
+    }
+
+    /**
+     * Gets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @return mixed The value.
+     */
+    public function get( $prop ) {
+
+        if ( isset( $this->data[ $prop ] ) ) {
+            return $this->data[ $prop ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Define class properties.
+     */
+    public function set_properties() {
+
+        // Sessions.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+        $this->tax              = new WPInv_EUVat();
+        $this->tax->init();
+        $GLOBALS['wpinv_euvat'] = $this->tax; // Backwards compatibility.
+
+        // Init other objects.
+        $this->set( 'reports', new WPInv_Reports() ); // TODO: Refactor.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $this->set( 'notes', new WPInv_Notes() );
+        $this->set( 'api', new WPInv_API() );
+        $this->set( 'post_types', new GetPaid_Post_Types() );
+        $this->set( 'template', new GetPaid_Template() );
+        $this->set( 'admin', new GetPaid_Admin() );
+        $this->set( 'subscriptions', new WPInv_Subscriptions() );
+        $this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
+        $this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
+        $this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
+        $this->set( 'payment_forms', new GetPaid_Payment_Forms() );
+
+    }
+
+        /**
+         * Define plugin constants.
+         */
+    public function define_constants() {
+        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
+        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        $this->version = WPINV_VERSION;
+    }
+
+    /**
+     * Hook into actions and filters.
+     *
+     * @since 1.0.19
+     */
+    protected function init_hooks() {
+        /* Internationalize the text strings used. */
+        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+
+        // Init the plugin after WordPress inits.
+        add_action( 'init', array( $this, 'init' ), 1 );
+        add_action( 'getpaid_init', array( $this, 'maybe_process_ipn' ), 5 );
+        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+
+        if ( class_exists( 'BuddyPress' ) ) {
+            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        }
+
+        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
+        add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
+        add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
+        add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
+        add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+
+        // Fires after registering actions.
+        do_action( 'wpinv_actions', $this );
+        do_action( 'getpaid_actions', $this );
+
+    }
+
+    public function plugins_loaded() {
+        /* Internationalize the text strings used. */
+        $this->load_textdomain();
+
+        do_action( 'wpinv_loaded' );
+
+        // Fix oxygen page builder conflict
+        if ( function_exists( 'ct_css_output' ) ) {
+            wpinv_oxygen_fix_conflict();
+        }
+    }
+
+    /**
+     * Load the translation of the plugin.
+     *
+     * @since 1.0
+     */
+    public function load_textdomain( $locale = NULL ) {
+        if ( empty( $locale ) ) {
+            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+        }
+
+        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+
+        unload_textdomain( 'invoicing' );
+        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
+        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+
+        /**
+         * Define language constants.
+         */
+        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+    }
+
+    /**
+     * Include required core files used in admin and on the frontend.
+     */
+    public function includes() {
+
+        // Start with the settings.
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+
+        // Packages/libraries.
+        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
+        require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+
+        // Load functions.
+        require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
+
+        // Register autoloader.
+        try {
+            spl_autoload_register( array( $this, 'autoload' ), true );
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+        }
+
+        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
+
+        /**
+         * Load the tax class.
+         */
+        if ( ! class_exists( 'WPInv_EUVat' ) ) {
+            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        }
+
+        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+            GetPaid_Post_Types_Admin::init();
+
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+            // load the user class only on the users.php page
+            global $pagenow;
+            if($pagenow=='users.php'){
+                new WPInv_Admin_Users();
+            }
+        }
+
+        // Register cli commands
+        if ( defined( 'WP_CLI' ) && WP_CLI ) {
+            require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
+            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        }
+
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+    }
+
+    /**
+     * Class autoloader
+     *
+     * @param       string $class_name The name of the class to load.
+     * @access      public
+     * @since       1.0.19
+     * @return      void
+     */
+    public function autoload( $class_name ) {
+
+        // Normalize the class name...
+        $class_name  = strtolower( $class_name );
+
+        // ... and make sure it is our class.
+        if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+            return;
+        }
+
+        // Next, prepare the file name from the class.
+        $file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+
+        // Base path of the classes.
+        $plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+
+        // And an array of possible locations in order of importance.
+        $locations = array(
+            "$plugin_path/includes",
+            "$plugin_path/includes/data-stores",
+            "$plugin_path/includes/gateways",
+            "$plugin_path/includes/payments",
+            "$plugin_path/includes/api",
+            "$plugin_path/includes/admin",
+            "$plugin_path/includes/admin/meta-boxes",
+        );
+
+        foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+
+            if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
+                include trailingslashit( $location ) . $file_name;
+                break;
+            }
+
+        }
+
+    }
+
+    /**
+     * Inits hooks etc.
+     */
+    public function init() {
+
+        // Fires before getpaid inits.
+        do_action( 'before_getpaid_init', $this );
+
+        // Load default gateways.
+        $gateways = apply_filters(
+            'getpaid_default_gateways',
+            array(
+                'manual'        => 'GetPaid_Manual_Gateway',
+                'paypal'        => 'GetPaid_Paypal_Gateway',
+                'worldpay'      => 'GetPaid_Worldpay_Gateway',
+                'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
+                'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
+            )
+        );
+
+        foreach ( $gateways as $id => $class ) {
+            $this->gateways[ $id ] = new $class();
+        }
+
+        // Fires after getpaid inits.
+        do_action( 'getpaid_init', $this );
+
+    }
+
+    /**
+     * Checks if this is an IPN request and processes it.
+     */
+    public function maybe_process_ipn() {
+
+        // Ensure that this is an IPN request.
+        if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+            return;
+        }
+
+        $gateway = wpinv_clean( $_GET['wpi-gateway'] );
+
+        do_action( 'wpinv_verify_payment_ipn', $gateway );
+        do_action( "wpinv_verify_{$gateway}_ipn" );
+        exit;
+
+    }
+
+    public function enqueue_scripts() {
+        $suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
+        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
+        wp_enqueue_style( 'wpinv_front_style' );
+
+        // Register scripts
+        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ) );
+
+        $localize                         = array();
+        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['currency_symbol']      = wpinv_currency_symbol();
+        $localize['currency_pos']         = wpinv_currency_position();
+        $localize['thousand_sep']         = wpinv_thousands_separator();
+        $localize['decimal_sep']          = wpinv_decimal_separator();
+        $localize['decimals']             = wpinv_decimals();
+        $localize['txtComplete']          = __( 'Continue', 'invoicing' );
+        $localize['UseTaxes']             = wpinv_use_taxes();
+        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
+        $localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+
+        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+
+        wp_enqueue_script( 'jquery-blockui' );
+        $autofill_api = wpinv_get_option('address_autofill_api');
+        $autofill_active = wpinv_get_option('address_autofill_active');
+        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
+            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
+                wp_dequeue_script( 'google-maps-api' );
+            }
+            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
+            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+        }
+
+        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all' );
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+
+        wp_enqueue_script( 'wpinv-front-script' );
+        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
+        wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script', 'wp-hooks' ),  $version, true );
+    }
+
+    public function wpinv_actions() {
+        if ( isset( $_REQUEST['wpi_action'] ) ) {
+            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        }
+    }
+
+    /**
      * Fires an action after verifying that a user can fire them.
-	 *
-	 * Note: If the action is on an invoice, subscription etc, esure that the
-	 * current user owns the invoice/subscription.
+     *
+     * Note: If the action is on an invoice, subscription etc, esure that the
+     * current user owns the invoice/subscription.
      */
     public function maybe_do_authenticated_action() {
 
@@ -438,82 +438,82 @@ 
 
     }
 
-	public function pre_get_posts( $wp_query ) {
-		if ( ! is_admin() && !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
-		}
-
-		return $wp_query;
-	}
-
-	public function bp_invoicing_init() {
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
-	}
-
-	/**
-	 * Register widgets
-	 *
-	 */
-	public function register_widgets() {
-		$widgets = apply_filters(
-			'getpaid_widget_classes',
-			array(
-				'WPInv_Checkout_Widget',
-				'WPInv_History_Widget',
-				'WPInv_Receipt_Widget',
-				'WPInv_Subscriptions_Widget',
-				'WPInv_Buy_Item_Widget',
-				'WPInv_Messages_Widget',
-				'WPInv_GetPaid_Widget'
-			)
-		);
-
-		foreach ( $widgets as $widget ) {
-			register_widget( $widget );
-		}
+    public function pre_get_posts( $wp_query ) {
+        if ( ! is_admin() && !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
+            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+        }
+
+        return $wp_query;
+    }
+
+    public function bp_invoicing_init() {
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+    }
+
+    /**
+     * Register widgets
+     *
+     */
+    public function register_widgets() {
+        $widgets = apply_filters(
+            'getpaid_widget_classes',
+            array(
+                'WPInv_Checkout_Widget',
+                'WPInv_History_Widget',
+                'WPInv_Receipt_Widget',
+                'WPInv_Subscriptions_Widget',
+                'WPInv_Buy_Item_Widget',
+                'WPInv_Messages_Widget',
+                'WPInv_GetPaid_Widget'
+            )
+        );
+
+        foreach ( $widgets as $widget ) {
+            register_widget( $widget );
+        }
 		
-	}
+    }
 
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param int[] $excluded_posts_ids
-	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param int[] $excluded_posts_ids
+     */
+    public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
 
-		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
-			$excluded_posts_ids = array();
-		}
+        // Ensure that we have an array.
+        if ( ! is_array( $excluded_posts_ids ) ) {
+            $excluded_posts_ids = array();
+        }
 
-		// Prepare our pages.
-		$our_pages = array();
+        // Prepare our pages.
+        $our_pages = array();
 
-		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+        // Checkout page.
+        $our_pages[] = wpinv_get_option( 'checkout_page', false );
 
-		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+        // Success page.
+        $our_pages[] = wpinv_get_option( 'success_page', false );
 
-		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+        // Failure page.
+        $our_pages[] = wpinv_get_option( 'failure_page', false );
 
-		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+        // History page.
+        $our_pages[] = wpinv_get_option( 'invoice_history_page', false );
 
-		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+        // Subscriptions page.
+        $our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+        $our_pages   = array_map( 'intval', array_filter( $our_pages ) );
 
-		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+        $excluded_posts_ids = $excluded_posts_ids + $our_pages;
+        return array_unique( $excluded_posts_ids );
 
-	}
+    }
 
-	public function wp_footer() {
-		echo '
+    public function wp_footer() {
+        echo '
 			<div class="bsui">
 				<div  id="getpaid-payment-modal" class="modal" tabindex="-1" role="dialog">
 					<div class="modal-dialog modal-dialog-centered modal-lg" role="checkout" style="max-width: 650px;">
@@ -524,6 +524,6 @@ 
 				</div>
 			</div>
 		';
-	}
+    }
 
 }

includes/admin/class-getpaid-admin.php

Indentation +211 added lines, -211 removed lines

@@ -14,62 +14,62 @@ 
 class GetPaid_Admin {
 
     /**
-	 * Local path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
-	public $admin_path;
-
-	/**
-	 * Web path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
+     * Local path to this plugins admin directory
+     *
+     * @var         string
+     */
+    public $admin_path;
+
+    /**
+     * Web path to this plugins admin directory
+     *
+     * @var         string
+     */
     public $admin_url;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct(){
+     * Class constructor.
+     */
+    public function __construct(){
 
         $this->admin_path  = plugin_dir_path( __FILE__ );
         $this->admin_url   = plugins_url( '/', __FILE__ );
 
         if ( is_admin() ) {
-			$this->init_admin_hooks();
+            $this->init_admin_hooks();
         }
 
     }
 
     /**
-	 * Init action and filter hooks
-	 *
-	 */
-	private function init_admin_hooks() {
+     * Init action and filter hooks
+     *
+     */
+    private function init_admin_hooks() {
         add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ) );
         add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
         add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
         add_action( 'admin_init', array( $this, 'activation_redirect') );
         add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action( 'admin_notices', array( $this, 'show_notices' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
+        do_action( 'getpaid_init_admin_hooks', $this );
 
     }
 
     /**
-	 * Register admin scripts
-	 *
-	 */
-	public function enqeue_scripts() {
+     * Register admin scripts
+     *
+     */
+    public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
-		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
+        $page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         // General styles.
@@ -93,30 +93,30 @@ 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+        if ( 'wpi_payment_form' == $page && $editing ) {
             $this->load_payment_form_scripts();
         }
 
         if ( $page == 'wpinv-subscriptions' ) {
-			wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-			wp_enqueue_script( 'wpinv-sub-admin-script' );
-		}
+            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
+            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        }
 
-		if ( $page == 'wpinv-reports' ) {
-			wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
-		}
+        if ( $page == 'wpinv-reports' ) {
+            wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
+        }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
-		}
+        if ( $page == 'wpinv-subscriptions' ) {
+            wp_enqueue_script( 'postbox' );
+        }
 
     }
 
     /**
-	 * Returns admin js translations.
-	 *
-	 */
-	protected function get_admin_i18() {
+     * Returns admin js translations.
+     *
+     */
+    protected function get_admin_i18() {
         global $post;
 
         return array(
@@ -157,32 +157,32 @@ 
     }
 
     /**
-	 * Loads payment form js.
-	 *
-	 */
-	protected function load_payment_form_scripts() {
+     * Loads payment form js.
+     *
+     */
+    protected function load_payment_form_scripts() {
         global $post;
 
         wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
+        wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
+        wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
 
-		wp_localize_script(
+        wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
-				'currency'      => wpinv_currency_symbol(),
-				'position'      => wpinv_currency_position(),
-				'decimals'      => (int) wpinv_decimals(),
-				'thousands_sep' => wpinv_thousands_separator(),
-				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
-				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
+                'elements'      => wpinv_get_data( 'payment-form-elements' ),
+                'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+                'currency'      => wpinv_currency_symbol(),
+                'position'      => wpinv_currency_position(),
+                'decimals'      => (int) wpinv_decimals(),
+                'thousands_sep' => wpinv_thousands_separator(),
+                'decimals_sep'  => wpinv_decimal_separator(),
+                'form_items'    => gepaid_get_form_items( $post->ID ),
+                'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
@@ -191,20 +191,20 @@ 
     }
 
     /**
-	 * Add our classes to admin pages.
+     * Add our classes to admin pages.
      *
      * @param string $classes
      * @return string
-	 *
-	 */
+     *
+     */
     public function admin_body_class( $classes ) {
-		global $pagenow, $post, $current_screen;
+        global $pagenow, $post, $current_screen;
 
 
         $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         if ( false !== stripos( $page, 'wpi' ) ) {
@@ -215,27 +215,27 @@ 
             $classes .= ' wpinv-cpt wpinv';
         }
 
-		if ( $pagenow == 'post.php' && $page == 'wpi_item' && ! empty( $post ) && ! wpinv_item_is_editable( $post ) ) {
-			$classes .= ' wpi-editable-n';
-		}
+        if ( $pagenow == 'post.php' && $page == 'wpi_item' && ! empty( $post ) && ! wpinv_item_is_editable( $post ) ) {
+            $classes .= ' wpi-editable-n';
+        }
 
-		return $classes;
+        return $classes;
     }
 
     /**
-	 * Maybe show the AyeCode Connect Notice.
-	 */
-	public function init_ayecode_connect_helper(){
+     * Maybe show the AyeCode Connect Notice.
+     */
+    public function init_ayecode_connect_helper(){
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-				'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-				'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-				'connect_button'    => __("Connect Site","invoicing"),
-				'connecting_button'    => __("Connecting...","invoicing"),
-				'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-				'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+                'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
+                'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
+                'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
+                'connect_button'    => __("Connect Site","invoicing"),
+                'connecting_button'    => __("Connecting...","invoicing"),
+                'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
+                'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
             ),
             array( 'wpi-addons' )
         );
@@ -247,21 +247,21 @@ 
      */
     public function activation_redirect() {
 
-		// Bail if no activation redirect.
-		if ( ! get_transient( '_wpinv_activation_redirect' ) || wp_doing_ajax() ) {
-			return;
-		}
+        // Bail if no activation redirect.
+        if ( ! get_transient( '_wpinv_activation_redirect' ) || wp_doing_ajax() ) {
+            return;
+        }
 
-		// Delete the redirect transient.
-		delete_transient( '_wpinv_activation_redirect' );
+        // Delete the redirect transient.
+        delete_transient( '_wpinv_activation_redirect' );
 
-		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-			return;
-		}
+        // Bail if activating from network, or bulk
+        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+            return;
+        }
 
-		wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
-		exit;
+        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        exit;
     }
 
     /**
@@ -276,150 +276,150 @@ 
 
     }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_invoice( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ) );
+        $sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ) );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not sent the invoice to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not sent the invoice to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+        $sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
     /**
-	 * Returns an array of admin notices.
-	 *
-	 * @since       1.0.19
+     * Returns an array of admin notices.
+     *
+     * @since       1.0.19
      * @return array
-	 */
-	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
+     */
+    public function get_notices() {
+        $notices = get_option( 'wpinv_admin_notices' );
         return is_array( $notices ) ? $notices : array();
-	}
-
-	/**
-	 * Clears all admin notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
-	}
-
-	/**
-	 * Saves a new admin notice
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function save_notice( $type, $message ) {
-		$notices = $this->get_notices();
-
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
-		}
-
-		$notices[ $type ][] = $message;
-
-		update_option( 'wpinv_admin_notices', $notices );
-	}
-
-	/**
-	 * Displays a success notice
-	 *
-	 * @param       string $msg The message to qeue.
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
-	}
-
-	/**
-	 * Displays a error notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
-	}
-
-	/**
-	 * Displays a warning notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
-	}
-
-	/**
-	 * Displays a info notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
-	}
-
-	/**
-	 * Show notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_notices() {
+    }
+
+    /**
+     * Clears all admin notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function clear_notices() {
+        delete_option( 'wpinv_admin_notices' );
+    }
+
+    /**
+     * Saves a new admin notice
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function save_notice( $type, $message ) {
+        $notices = $this->get_notices();
+
+        if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
+            $notices[ $type ] = array();
+        }
+
+        $notices[ $type ][] = $message;
+
+        update_option( 'wpinv_admin_notices', $notices );
+    }
+
+    /**
+     * Displays a success notice
+     *
+     * @param       string $msg The message to qeue.
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_success( $msg ) {
+        $this->save_notice( 'success', $msg );
+    }
+
+    /**
+     * Displays a error notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_error( $msg ) {
+        $this->save_notice( 'error', $msg );
+    }
+
+    /**
+     * Displays a warning notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_warning( $msg ) {
+        $this->save_notice( 'warning', $msg );
+    }
+
+    /**
+     * Displays a info notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_info( $msg ) {
+        $this->save_notice( 'info', $msg );
+    }
+
+    /**
+     * Show notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_notices() {
 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+        foreach ( $notices as $type => $messages ) {
 
-			if ( ! is_array( $messages ) ) {
-				continue;
-			}
+            if ( ! is_array( $messages ) ) {
+                continue;
+            }
 
             $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
+            foreach ( $messages as $message ) {
                 $message = wp_kses_post( $message );
-				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
+                echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
             }
 
         }
 
-	}
+    }
 
 }

Spacing +125 added lines, -125 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main admin class.
@@ -30,12 +30,12 @@ 
     /**
 	 * Class constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 
-        $this->admin_path  = plugin_dir_path( __FILE__ );
-        $this->admin_url   = plugins_url( '/', __FILE__ );
+        $this->admin_path  = plugin_dir_path(__FILE__);
+        $this->admin_url   = plugins_url('/', __FILE__);
 
-        if ( is_admin() ) {
+        if (is_admin()) {
 			$this->init_admin_hooks();
         }
 
@@ -46,15 +46,15 @@ 
 	 *
 	 */
 	private function init_admin_hooks() {
-        add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ) );
-        add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
-        add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
-        add_action( 'admin_init', array( $this, 'activation_redirect') );
-        add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action('admin_enqueue_scripts', array($this, 'enqeue_scripts'));
+        add_filter('admin_body_class', array($this, 'admin_body_class'));
+        add_action('admin_init', array($this, 'init_ayecode_connect_helper'));
+        add_action('admin_init', array($this, 'activation_redirect'));
+        add_action('admin_init', array($this, 'maybe_do_admin_action'));
+		add_action('admin_notices', array($this, 'show_notices'));
+		add_action('getpaid_authenticated_admin_action_send_invoice', array($this, 'send_customer_invoice'));
+		add_action('getpaid_authenticated_admin_action_send_invoice_reminder', array($this, 'send_customer_payment_reminder'));
+		do_action('getpaid_init_admin_hooks', $this);
 
     }
 
@@ -65,49 +65,49 @@ 
 	public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+		$page    = isset($_GET['page']) ? $_GET['page'] : '';
 		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( false !== stripos( $page, 'wpi' ) ) {
+        if (false !== stripos($page, 'wpi')) {
 
             // Styles.
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/admin.css' );
-            wp_enqueue_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array( 'wp-color-picker' ), $version );
-            wp_enqueue_style( 'select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all' );
-            wp_enqueue_style( 'wp_enqueue_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-            wp_enqueue_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui.min.css', array(), '1.8.16' );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/admin.css');
+            wp_enqueue_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array('wp-color-picker'), $version);
+            wp_enqueue_style('select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all');
+            wp_enqueue_style('wp_enqueue_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+            wp_enqueue_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui.min.css', array(), '1.8.16');
 
             // Scripts.
-            wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '4.0.13', true );
-            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array( 'jquery' ), WPINV_VERSION );
+            wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '4.0.13', true);
+            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array('jquery'), WPINV_VERSION);
 
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin.js' );
-            wp_enqueue_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip', 'wp-color-picker', 'jquery-ui-datepicker' ),  $version );
-            wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', apply_filters( 'wpinv_admin_js_localize', $this->get_admin_i18() ) );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin.js');
+            wp_enqueue_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip', 'wp-color-picker', 'jquery-ui-datepicker'), $version);
+            wp_localize_script('wpinv-admin-script', 'WPInv_Admin', apply_filters('wpinv_admin_js_localize', $this->get_admin_i18()));
 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+		if ('wpi_payment_form' == $page && $editing) {
             $this->load_payment_form_scripts();
         }
 
-        if ( $page == 'wpinv-subscriptions' ) {
-			wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-			wp_enqueue_script( 'wpinv-sub-admin-script' );
+        if ($page == 'wpinv-subscriptions') {
+			wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array('wpinv-admin-script'), WPINV_VERSION);
+			wp_enqueue_script('wpinv-sub-admin-script');
 		}
 
-		if ( $page == 'wpinv-reports' ) {
-			wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
+		if ($page == 'wpinv-reports') {
+			wp_enqueue_script('jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array('jquery'), '0.7');
 		}
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
+		if ($page == 'wpinv-subscriptions') {
+			wp_enqueue_script('postbox');
 		}
 
     }
@@ -120,13 +120,13 @@ 
         global $post;
 
         return array(
-            'ajax_url'                  => admin_url( 'admin-ajax.php' ),
-            'post_ID'                   => isset( $post->ID ) ? $post->ID : '',
-            'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
-            'add_invoice_note_nonce'    => wp_create_nonce( 'add-invoice-note' ),
-            'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ),
-            'invoice_item_nonce'        => wp_create_nonce( 'invoice-item' ),
-            'billing_details_nonce'     => wp_create_nonce( 'get-billing-details' ),
+            'ajax_url'                  => admin_url('admin-ajax.php'),
+            'post_ID'                   => isset($post->ID) ? $post->ID : '',
+            'wpinv_nonce'               => wp_create_nonce('wpinv-nonce'),
+            'add_invoice_note_nonce'    => wp_create_nonce('add-invoice-note'),
+            'delete_invoice_note_nonce' => wp_create_nonce('delete-invoice-note'),
+            'invoice_item_nonce'        => wp_create_nonce('invoice-item'),
+            'billing_details_nonce'     => wp_create_nonce('get-billing-details'),
             'tax'                       => wpinv_tax_amount(),
             'discount'                  => wpinv_discount_amount(),
             'currency_symbol'           => wpinv_currency_symbol(),
@@ -134,24 +134,24 @@ 
             'thousand_sep'              => wpinv_thousands_separator(),
             'decimal_sep'               => wpinv_decimal_separator(),
             'decimals'                  => wpinv_decimals(),
-            'save_invoice'              => __( 'Save Invoice', 'invoicing' ),
-            'status_publish'            => wpinv_status_nicename( 'publish' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'delete_tax_rate'           => __( 'Are you sure you wish to delete this tax rate?', 'invoicing' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'OneItemMin'                => __( 'Invoice must contain at least one item', 'invoicing' ),
-            'FillBillingDetails'        => __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' ),
-            'confirmCalcTotals'         => __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' ),
-            'AreYouSure'                => __( 'Are you sure?', 'invoicing' ),
-            'emptyInvoice'              => __( 'Add at least one item to save invoice!', 'invoicing' ),
-            'errDeleteItem'             => __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' ),
-            'delete_subscription'       => __( 'Are you sure you want to delete this subscription?', 'invoicing' ),
-            'action_edit'               => __( 'Edit', 'invoicing' ),
-            'action_cancel'             => __( 'Cancel', 'invoicing' ),
-            'item_description'          => __( 'Item Description', 'invoicing' ),
-            'invoice_description'       => __( 'Invoice Description', 'invoicing' ),
-            'discount_description'      => __( 'Discount Description', 'invoicing' ),
-            'searching'                 => __( 'Searching', 'invoicing' ),
+            'save_invoice'              => __('Save Invoice', 'invoicing'),
+            'status_publish'            => wpinv_status_nicename('publish'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'delete_tax_rate'           => __('Are you sure you wish to delete this tax rate?', 'invoicing'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'OneItemMin'                => __('Invoice must contain at least one item', 'invoicing'),
+            'FillBillingDetails'        => __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing'),
+            'confirmCalcTotals'         => __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing'),
+            'AreYouSure'                => __('Are you sure?', 'invoicing'),
+            'emptyInvoice'              => __('Add at least one item to save invoice!', 'invoicing'),
+            'errDeleteItem'             => __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing'),
+            'delete_subscription'       => __('Are you sure you want to delete this subscription?', 'invoicing'),
+            'action_edit'               => __('Edit', 'invoicing'),
+            'action_cancel'             => __('Cancel', 'invoicing'),
+            'item_description'          => __('Item Description', 'invoicing'),
+            'invoice_description'       => __('Invoice Description', 'invoicing'),
+            'discount_description'      => __('Discount Description', 'invoicing'),
+            'searching'                 => __('Searching', 'invoicing'),
         );
 
     }
@@ -163,30 +163,30 @@ 
 	protected function load_payment_form_scripts() {
         global $post;
 
-        wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script('vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION);
+		wp_enqueue_script('sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION);
+		wp_enqueue_script('vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array('sortable', 'vue'), WPINV_VERSION);
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js');
+		wp_register_script('wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array('wpinv-admin-script', 'vue_draggable'), $version);
 
 		wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+				'elements'      => wpinv_get_data('payment-form-elements'),
+				'form_elements' => getpaid_get_payment_form_elements($post->ID),
 				'currency'      => wpinv_currency_symbol(),
 				'position'      => wpinv_currency_position(),
 				'decimals'      => (int) wpinv_decimals(),
 				'thousands_sep' => wpinv_thousands_separator(),
 				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
+				'form_items'    => gepaid_get_form_items($post->ID),
 				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
-        wp_enqueue_script( 'wpinv-admin-payment-form-script' );
+        wp_enqueue_script('wpinv-admin-payment-form-script');
 
     }
 
@@ -197,25 +197,25 @@ 
      * @return string
 	 *
 	 */
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
 		global $pagenow, $post, $current_screen;
 
 
-        $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $page = isset($_GET['page']) ? $_GET['page'] : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
-        if ( false !== stripos( $page, 'wpi' ) ) {
-            $classes .= ' wpi-' . sanitize_key( $page );
+        if (false !== stripos($page, 'wpi')) {
+            $classes .= ' wpi-' . sanitize_key($page);
         }
 
-        if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
+        if (in_array($page, wpinv_parse_list('wpi_invoice wpi_payment_form wpi_quote'))) {
             $classes .= ' wpinv-cpt wpinv';
         }
 
-		if ( $pagenow == 'post.php' && $page == 'wpi_item' && ! empty( $post ) && ! wpinv_item_is_editable( $post ) ) {
+		if ($pagenow == 'post.php' && $page == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
 			$classes .= ' wpi-editable-n';
 		}
 
@@ -225,19 +225,19 @@ 
     /**
 	 * Maybe show the AyeCode Connect Notice.
 	 */
-	public function init_ayecode_connect_helper(){
+	public function init_ayecode_connect_helper() {
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-				'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-				'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-				'connect_button'    => __("Connect Site","invoicing"),
-				'connecting_button'    => __("Connecting...","invoicing"),
-				'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-				'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+				'connect_title' => __("WP Invoicing - an AyeCode product!", "invoicing"),
+				'connect_external'  => __("Please confirm you wish to connect your site?", "invoicing"),
+				'connect'           => sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", "invoicing"), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+				'connect_button'    => __("Connect Site", "invoicing"),
+				'connecting_button'    => __("Connecting...", "invoicing"),
+				'error_localhost'   => __("This service will only work with a live domain, not a localhost.", "invoicing"),
+				'error'             => __("Something went wrong, please refresh and try again.", "invoicing"),
             ),
-            array( 'wpi-addons' )
+            array('wpi-addons')
         );
 
     }
@@ -248,19 +248,19 @@ 
     public function activation_redirect() {
 
 		// Bail if no activation redirect.
-		if ( ! get_transient( '_wpinv_activation_redirect' ) || wp_doing_ajax() ) {
+		if (!get_transient('_wpinv_activation_redirect') || wp_doing_ajax()) {
 			return;
 		}
 
 		// Delete the redirect transient.
-		delete_transient( '_wpinv_activation_redirect' );
+		delete_transient('_wpinv_activation_redirect');
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-		wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+		wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
 		exit;
     }
 
@@ -269,9 +269,9 @@ 
      */
     public function maybe_do_admin_action() {
 
-        if ( wpinv_current_user_can_manage_invoicing() && isset( $_REQUEST['getpaid-admin-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
-            $key = sanitize_key( $_REQUEST['getpaid-admin-action'] );
-            do_action( "getpaid_authenticated_admin_action_$key", $_REQUEST );
+        if (wpinv_current_user_can_manage_invoicing() && isset($_REQUEST['getpaid-admin-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
+            $key = sanitize_key($_REQUEST['getpaid-admin-action']);
+            do_action("getpaid_authenticated_admin_action_$key", $_REQUEST);
         }
 
     }
@@ -281,16 +281,16 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_invoice( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ) );
+    public function send_customer_invoice($args) {
+		$sent = getpaid()->get('invoice_emails')->user_invoice(new WPInv_Invoice($args['invoice_id']));
 
-		if ( $sent ) {
-			$this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Invoice was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not sent the invoice to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not sent the invoice to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -299,16 +299,16 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+    public function send_customer_payment_reminder($args) {
+		$sent = getpaid()->get('invoice_emails')->force_send_overdue_notice(new WPInv_Invoice($args['invoice_id']));
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Payment reminder was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not sent payment reminder to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -319,8 +319,8 @@ 
      * @return array
 	 */
 	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
-        return is_array( $notices ) ? $notices : array();
+		$notices = get_option('wpinv_admin_notices');
+        return is_array($notices) ? $notices : array();
 	}
 
 	/**
@@ -330,7 +330,7 @@ 
 	 * @since       1.0.19
 	 */
 	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
+		delete_option('wpinv_admin_notices');
 	}
 
 	/**
@@ -339,16 +339,16 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function save_notice( $type, $message ) {
+	public function save_notice($type, $message) {
 		$notices = $this->get_notices();
 
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
+		if (empty($notices[$type]) || !is_array($notices[$type])) {
+			$notices[$type] = array();
 		}
 
-		$notices[ $type ][] = $message;
+		$notices[$type][] = $message;
 
-		update_option( 'wpinv_admin_notices', $notices );
+		update_option('wpinv_admin_notices', $notices);
 	}
 
 	/**
@@ -358,8 +358,8 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
+	public function show_success($msg) {
+		$this->save_notice('success', $msg);
 	}
 
 	/**
@@ -369,8 +369,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
+	public function show_error($msg) {
+		$this->save_notice('error', $msg);
 	}
 
 	/**
@@ -380,8 +380,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
+	public function show_warning($msg) {
+		$this->save_notice('warning', $msg);
 	}
 
 	/**
@@ -391,8 +391,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
+	public function show_info($msg) {
+		$this->save_notice('info', $msg);
 	}
 
 	/**
@@ -406,15 +406,15 @@ 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+		foreach ($notices as $type => $messages) {
 
-			if ( ! is_array( $messages ) ) {
+			if (!is_array($messages)) {
 				continue;
 			}
 
-            $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
-                $message = wp_kses_post( $message );
+            $type = sanitize_key($type);
+			foreach ($messages as $message) {
+                $message = wp_kses_post($message);
 				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
             }
 

includes/class-wpinv-ajax.php

Indentation +58 added lines, -58 removed lines

@@ -14,70 +14,70 @@ 
 class WPInv_Ajax {
 
     /**
-	 * Hook in ajax handlers.
-	 */
-	public static function init() {
-		add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
-		add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
-		self::add_ajax_events();
+     * Hook in ajax handlers.
+     */
+    public static function init() {
+        add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
+        add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
+        self::add_ajax_events();
     }
 
     /**
-	 * Set GetPaid AJAX constant and headers.
-	 */
-	public static function define_ajax() {
-
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			getpaid_maybe_define_constant( 'DOING_AJAX', true );
-			getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
-			if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-				/** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
-			}
-			$GLOBALS['wpdb']->hide_errors();
-		}
+     * Set GetPaid AJAX constant and headers.
+     */
+    public static function define_ajax() {
+
+        if ( ! empty( $_GET['wpinv-ajax'] ) ) {
+            getpaid_maybe_define_constant( 'DOING_AJAX', true );
+            getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
+            if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
+                /** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
+            }
+            $GLOBALS['wpdb']->hide_errors();
+        }
 
     }
     
     /**
-	 * Send headers for GetPaid Ajax Requests.
-	 *
-	 * @since 1.0.18
-	 */
-	private static function wpinv_ajax_headers() {
-		if ( ! headers_sent() ) {
-			send_origin_headers();
-			send_nosniff_header();
-			nocache_headers();
-			header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-			header( 'X-Robots-Tag: noindex' );
-			status_header( 200 );
-		}
+     * Send headers for GetPaid Ajax Requests.
+     *
+     * @since 1.0.18
+     */
+    private static function wpinv_ajax_headers() {
+        if ( ! headers_sent() ) {
+            send_origin_headers();
+            send_nosniff_header();
+            nocache_headers();
+            header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+            header( 'X-Robots-Tag: noindex' );
+            status_header( 200 );
+        }
     }
     
     /**
-	 * Check for GetPaid Ajax request and fire action.
-	 */
-	public static function do_wpinv_ajax() {
-		global $wp_query;
+     * Check for GetPaid Ajax request and fire action.
+     */
+    public static function do_wpinv_ajax() {
+        global $wp_query;
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			$wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
-		}
+        if ( ! empty( $_GET['wpinv-ajax'] ) ) {
+            $wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
+        }
 
-		$action = $wp_query->get( 'wpinv-ajax' );
+        $action = $wp_query->get( 'wpinv-ajax' );
 
-		if ( $action ) {
-			self::wpinv_ajax_headers();
-			$action = sanitize_text_field( $action );
-			do_action( 'wpinv_ajax_' . $action );
-			wp_die();
-		}
+        if ( $action ) {
+            self::wpinv_ajax_headers();
+            $action = sanitize_text_field( $action );
+            do_action( 'wpinv_ajax_' . $action );
+            wp_die();
+        }
 
     }
 
     /**
-	 * Hook in ajax methods.
-	 */
+     * Hook in ajax methods.
+     */
     public static function add_ajax_events() {
 
         // array( 'event' => is_frontend )
@@ -260,24 +260,24 @@ 
         }
 
         // Is the request set up correctly?
-		if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
-			echo aui()->alert(
-				array(
-					'type'    => 'warning',
-					'content' => __( 'No payment form or item provided', 'invoicing' ),
-				)
+        if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+            echo aui()->alert(
+                array(
+                    'type'    => 'warning',
+                    'content' => __( 'No payment form or item provided', 'invoicing' ),
+                )
             );
             exit;
         }
 
         // Payment form or button?
-		if ( ! empty( $_GET['form'] ) ) {
+        if ( ! empty( $_GET['form'] ) ) {
             getpaid_display_payment_form( $_GET['form'] );
-		} else if( ! empty( $_GET['invoice'] ) ) {
-		    getpaid_display_invoice_payment_form( $_GET['invoice'] );
+        } else if( ! empty( $_GET['invoice'] ) ) {
+            getpaid_display_invoice_payment_form( $_GET['invoice'] );
         } else {
-			$items = getpaid_convert_items_to_array( $_GET['item'] );
-		    getpaid_display_item_payment_form( $items );
+            $items = getpaid_convert_items_to_array( $_GET['item'] );
+            getpaid_display_item_payment_form( $items );
         }
 
         exit;

Spacing +213 added lines, -213 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
  
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WPInv_Ajax class.
@@ -17,8 +17,8 @@ 
 	 * Hook in ajax handlers.
 	 */
 	public static function init() {
-		add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
-		add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
+		add_action('init', array(__CLASS__, 'define_ajax'), 0);
+		add_action('template_redirect', array(__CLASS__, 'do_wpinv_ajax'), 0);
 		self::add_ajax_events();
     }
 
@@ -27,11 +27,11 @@ 
 	 */
 	public static function define_ajax() {
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			getpaid_maybe_define_constant( 'DOING_AJAX', true );
-			getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
-			if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-				/** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
+		if (!empty($_GET['wpinv-ajax'])) {
+			getpaid_maybe_define_constant('DOING_AJAX', true);
+			getpaid_maybe_define_constant('WPInv_DOING_AJAX', true);
+			if (!WP_DEBUG || (WP_DEBUG && !WP_DEBUG_DISPLAY)) {
+				/** @scrutinizer ignore-unhandled */ @ini_set('display_errors', 0);
 			}
 			$GLOBALS['wpdb']->hide_errors();
 		}
@@ -44,13 +44,13 @@ 
 	 * @since 1.0.18
 	 */
 	private static function wpinv_ajax_headers() {
-		if ( ! headers_sent() ) {
+		if (!headers_sent()) {
 			send_origin_headers();
 			send_nosniff_header();
 			nocache_headers();
-			header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-			header( 'X-Robots-Tag: noindex' );
-			status_header( 200 );
+			header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+			header('X-Robots-Tag: noindex');
+			status_header(200);
 		}
     }
     
@@ -60,16 +60,16 @@ 
 	public static function do_wpinv_ajax() {
 		global $wp_query;
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			$wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
+		if (!empty($_GET['wpinv-ajax'])) {
+			$wp_query->set('wpinv-ajax', sanitize_text_field(wp_unslash($_GET['wpinv-ajax'])));
 		}
 
-		$action = $wp_query->get( 'wpinv-ajax' );
+		$action = $wp_query->get('wpinv-ajax');
 
-		if ( $action ) {
+		if ($action) {
 			self::wpinv_ajax_headers();
-			$action = sanitize_text_field( $action );
-			do_action( 'wpinv_ajax_' . $action );
+			$action = sanitize_text_field($action);
+			do_action('wpinv_ajax_' . $action);
 			wp_die();
 		}
 
@@ -102,36 +102,36 @@ 
             'ip_geolocation'              => true,
         );
 
-        foreach ( $ajax_events as $ajax_event => $nopriv ) {
-            add_action( 'wp_ajax_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-            add_action( 'wp_ajax_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+        foreach ($ajax_events as $ajax_event => $nopriv) {
+            add_action('wp_ajax_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+            add_action('wp_ajax_getpaid_' . $ajax_event, array(__CLASS__, $ajax_event));
 
-            if ( $nopriv ) {
-                add_action( 'wp_ajax_nopriv_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-                add_action( 'wp_ajax_nopriv_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-                add_action( 'wpinv_ajax_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+            if ($nopriv) {
+                add_action('wp_ajax_nopriv_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+                add_action('wp_ajax_nopriv_getpaid_' . $ajax_event, array(__CLASS__, $ajax_event));
+                add_action('wpinv_ajax_' . $ajax_event, array(__CLASS__, $ajax_event));
             }
         }
     }
     
     public static function add_note() {
-        check_ajax_referer( 'add-invoice-note', '_nonce' );
+        check_ajax_referer('add-invoice-note', '_nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
-        $post_id   = absint( $_POST['post_id'] );
-        $note      = wp_kses_post( trim( stripslashes( $_POST['note'] ) ) );
-        $note_type = sanitize_text_field( $_POST['note_type'] );
+        $post_id   = absint($_POST['post_id']);
+        $note      = wp_kses_post(trim(stripslashes($_POST['note'])));
+        $note_type = sanitize_text_field($_POST['note_type']);
 
         $is_customer_note = $note_type == 'customer' ? 1 : 0;
 
-        if ( $post_id > 0 ) {
-            $note_id = wpinv_insert_payment_note( $post_id, $note, $is_customer_note );
+        if ($post_id > 0) {
+            $note_id = wpinv_insert_payment_note($post_id, $note, $is_customer_note);
 
-            if ( $note_id > 0 && !is_wp_error( $note_id ) ) {
-                wpinv_get_invoice_note_line_item( $note_id );
+            if ($note_id > 0 && !is_wp_error($note_id)) {
+                wpinv_get_invoice_note_line_item($note_id);
             }
         }
 
@@ -139,16 +139,16 @@ 
     }
 
     public static function delete_note() {
-        check_ajax_referer( 'delete-invoice-note', '_nonce' );
+        check_ajax_referer('delete-invoice-note', '_nonce');
 
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
-        $note_id = (int)$_POST['note_id'];
+        $note_id = (int) $_POST['note_id'];
 
-        if ( $note_id > 0 ) {
-            wp_delete_comment( $note_id, true );
+        if ($note_id > 0) {
+            wp_delete_comment($note_id, true);
         }
 
         die();
@@ -166,34 +166,34 @@ 
     public static function get_billing_details() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
         // Do we have a user id?
         $user_id = $_GET['user_id'];
 
-        if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
+        if (empty($user_id) || !is_numeric($user_id)) {
             die(-1);
         }
 
         // Fetch the billing details.
-        $billing_details    = wpinv_get_user_address( $user_id );
-        $billing_details    = apply_filters( 'wpinv_ajax_billing_details', $billing_details, $user_id );
+        $billing_details    = wpinv_get_user_address($user_id);
+        $billing_details    = apply_filters('wpinv_ajax_billing_details', $billing_details, $user_id);
 
         // unset the user id and email.
-        $to_ignore = array( 'user_id', 'email' );
+        $to_ignore = array('user_id', 'email');
 
-        foreach ( $to_ignore as $key ) {
-            if ( isset( $billing_details[ $key ] ) ) {
-                unset( $billing_details[ $key ] );
+        foreach ($to_ignore as $key) {
+            if (isset($billing_details[$key])) {
+                unset($billing_details[$key]);
             }
         }
 
-        wp_send_json_success( $billing_details );
+        wp_send_json_success($billing_details);
 
     }
 
@@ -203,47 +203,47 @@ 
     public static function check_new_user_email() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
         // We need an email address.
-        if ( empty( $_GET['email'] ) ) {
-            _e( "Provide the new user's email address", 'invoicing' );
+        if (empty($_GET['email'])) {
+            _e("Provide the new user's email address", 'invoicing');
             exit;
         }
 
         // Ensure the email is valid.
-        $email = sanitize_text_field( $_GET['email'] );
-        if ( ! is_email( $email ) ) {
-            _e( 'Invalid email address', 'invoicing' );
+        $email = sanitize_text_field($_GET['email']);
+        if (!is_email($email)) {
+            _e('Invalid email address', 'invoicing');
             exit;
         }
 
         // And it does not exist.
-        if ( email_exists( $email ) ) {
-            _e( 'A user with this email address already exists', 'invoicing' );
+        if (email_exists($email)) {
+            _e('A user with this email address already exists', 'invoicing');
             exit;
         }
 
-        wp_send_json_success( true );
+        wp_send_json_success(true);
     }
     
     public static function run_tool() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
         
-        $tool = sanitize_text_field( $_POST['tool'] );
+        $tool = sanitize_text_field($_POST['tool']);
         
-        do_action( 'wpinv_run_tool' );
+        do_action('wpinv_run_tool');
         
-        if ( !empty( $tool ) ) {
-            do_action( 'wpinv_tool_' . $tool );
+        if (!empty($tool)) {
+            do_action('wpinv_tool_' . $tool);
         }
     }
 
@@ -253,30 +253,30 @@ 
     public static function get_payment_form() {
 
         // Check nonce.
-        if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'], 'getpaid_ajax_form' ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (!isset($_GET['nonce']) || !wp_verify_nonce($_GET['nonce'], 'getpaid_ajax_form')) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
         // Is the request set up correctly?
-		if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+		if (empty($_GET['form']) && empty($_GET['item'])) {
 			echo aui()->alert(
 				array(
 					'type'    => 'warning',
-					'content' => __( 'No payment form or item provided', 'invoicing' ),
+					'content' => __('No payment form or item provided', 'invoicing'),
 				)
             );
             exit;
         }
 
         // Payment form or button?
-		if ( ! empty( $_GET['form'] ) ) {
-            getpaid_display_payment_form( $_GET['form'] );
-		} else if( ! empty( $_GET['invoice'] ) ) {
-		    getpaid_display_invoice_payment_form( $_GET['invoice'] );
+		if (!empty($_GET['form'])) {
+            getpaid_display_payment_form($_GET['form']);
+		} else if (!empty($_GET['invoice'])) {
+		    getpaid_display_invoice_payment_form($_GET['invoice']);
         } else {
-			$items = getpaid_convert_items_to_array( $_GET['item'] );
-		    getpaid_display_item_payment_form( $items );
+			$items = getpaid_convert_items_to_array($_GET['item']);
+		    getpaid_display_item_payment_form($items);
         }
 
         exit;
@@ -291,17 +291,17 @@ 
     public static function payment_form() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
         // Process the payment form.
-        $checkout_class = apply_filters( 'getpaid_checkout_class', 'GetPaid_Checkout' );
-        $checkout       = new $checkout_class( new GetPaid_Payment_Form_Submission() );
+        $checkout_class = apply_filters('getpaid_checkout_class', 'GetPaid_Checkout');
+        $checkout       = new $checkout_class(new GetPaid_Payment_Form_Submission());
         $checkout->process_checkout();
 
         exit;
@@ -314,51 +314,51 @@ 
      */
     public static function get_payment_form_states_field() {
 
-        if ( empty( $_GET['country'] ) || empty( $_GET['form'] ) ) {
+        if (empty($_GET['country']) || empty($_GET['form'])) {
             exit;
         }
 
-        $elements = getpaid_get_payment_form_elements( $_GET['form'] );
+        $elements = getpaid_get_payment_form_elements($_GET['form']);
 
-        if ( empty( $elements ) ) {
+        if (empty($elements)) {
             exit;
         }
 
         $address_fields = array();
-        foreach ( $elements as $element ) {
-            if ( 'address' === $element['type'] ) {
+        foreach ($elements as $element) {
+            if ('address' === $element['type']) {
                 $address_fields = $element;
                 break;
             }
         }
 
-        if ( empty( $address_fields ) ) {
+        if (empty($address_fields)) {
             exit;
         }
 
-        foreach( $address_fields['fields'] as $address_field ) {
+        foreach ($address_fields['fields'] as $address_field) {
 
-            if ( 'wpinv_state' == $address_field['name'] ) {
+            if ('wpinv_state' == $address_field['name']) {
 
                 $label = $address_field['label'];
 
-                if ( ! empty( $address_field['required'] ) ) {
+                if (!empty($address_field['required'])) {
                     $label .= "<span class='text-danger'> *</span>";
                 }
 
-                $states = wpinv_get_country_states( $_GET['country'] );
+                $states = wpinv_get_country_states($_GET['country']);
 
-                if ( ! empty( $states ) ) {
+                if (!empty($states)) {
 
                     $html = aui()->select(
                             array(
                                 'options'          => $states,
-                                'name'             => esc_attr( $address_field['name'] ),
-                                'id'               => esc_attr( $address_field['name'] ),
-                                'placeholder'      => esc_attr( $address_field['placeholder'] ),
+                                'name'             => esc_attr($address_field['name']),
+                                'id'               => esc_attr($address_field['name']),
+                                'placeholder'      => esc_attr($address_field['placeholder']),
                                 'required'         => (bool) $address_field['required'],
                                 'no_wrap'          => true,
-                                'label'            => wp_kses_post( $label ),
+                                'label'            => wp_kses_post($label),
                                 'select2'          => false,
                             )
                         );
@@ -367,10 +367,10 @@ 
 
                     $html = aui()->input(
                             array(
-                                'name'       => esc_attr( $address_field['name'] ),
-                                'id'         => esc_attr( $address_field['name'] ),
+                                'name'       => esc_attr($address_field['name']),
+                                'id'         => esc_attr($address_field['name']),
                                 'required'   => (bool) $address_field['required'],
-                                'label'      => wp_kses_post( $label ),
+                                'label'      => wp_kses_post($label),
                                 'no_wrap'    => true,
                                 'type'       => 'text',
                             )
@@ -378,7 +378,7 @@ 
 
                 }
 
-                wp_send_json_success( str_replace( 'sr-only', '', $html ) );
+                wp_send_json_success(str_replace('sr-only', '', $html));
                 exit;
 
             }
@@ -394,56 +394,56 @@ 
     public static function recalculate_invoice_totals() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice.
-        if ( empty( $_POST['post_id'] ) ) {
+        if (empty($_POST['post_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( trim( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(trim($_POST['post_id']));
 
         // Ensure it exists.
-        if ( ! $invoice->get_id() ) {
+        if (!$invoice->get_id()) {
             exit;
         }
 
         // Maybe set the country, state, currency.
-        foreach ( array( 'country', 'state', 'currency' ) as $key ) {
-            if ( isset( $_POST[ $key ] ) ) {
+        foreach (array('country', 'state', 'currency') as $key) {
+            if (isset($_POST[$key])) {
                 $method = "set_$key";
-                $invoice->$method( $_POST[ $key ] );
+                $invoice->$method($_POST[$key]);
             }
         }
 
         // Maybe disable taxes.
-        $invoice->set_disable_taxes( ! empty( $_POST['taxes'] ) );
+        $invoice->set_disable_taxes(!empty($_POST['taxes']));
 
         // Recalculate totals.
         $invoice->recalculate_total();
 
-        $total = wpinv_price( wpinv_format_amount( $invoice->get_total() ), $invoice->get_currency() );
+        $total = wpinv_price(wpinv_format_amount($invoice->get_total()), $invoice->get_currency());
 
-        if ( $invoice->is_recurring() && $invoice->is_parent() && $invoice->get_total() != $invoice->get_recurring_total() ) {
-            $recurring_total = wpinv_price( wpinv_format_amount( $invoice->get_recurring_total() ), $invoice->get_currency() );
-            $total          .= '<small class="form-text text-muted">' . sprintf( __( 'Recurring Price: %s', 'invoicing' ), $recurring_total ) . '</small>';
+        if ($invoice->is_recurring() && $invoice->is_parent() && $invoice->get_total() != $invoice->get_recurring_total()) {
+            $recurring_total = wpinv_price(wpinv_format_amount($invoice->get_recurring_total()), $invoice->get_currency());
+            $total          .= '<small class="form-text text-muted">' . sprintf(__('Recurring Price: %s', 'invoicing'), $recurring_total) . '</small>';
         }
 
         $totals = array(
-            'subtotal' => wpinv_price( wpinv_format_amount( $invoice->get_subtotal() ), $invoice->get_currency() ),
-            'discount' => wpinv_price( wpinv_format_amount( $invoice->get_total_discount() ), $invoice->get_currency() ),
-            'tax'      => wpinv_price( wpinv_format_amount( $invoice->get_total_tax() ), $invoice->get_currency() ),
+            'subtotal' => wpinv_price(wpinv_format_amount($invoice->get_subtotal()), $invoice->get_currency()),
+            'discount' => wpinv_price(wpinv_format_amount($invoice->get_total_discount()), $invoice->get_currency()),
+            'tax'      => wpinv_price(wpinv_format_amount($invoice->get_total_tax()), $invoice->get_currency()),
             'total'    => $total,
         );
 
-        $totals = apply_filters( 'getpaid_invoice_totals', $totals, $invoice );
+        $totals = apply_filters('getpaid_invoice_totals', $totals, $invoice);
 
-        wp_send_json_success( compact( 'totals' ) );
+        wp_send_json_success(compact('totals'));
     }
 
     /**
@@ -452,33 +452,33 @@ 
     public static function get_invoice_items() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and items.
-        if ( empty( $_POST['post_id'] ) ) {
+        if (empty($_POST['post_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( trim( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(trim($_POST['post_id']));
 
         // Ensure it exists.
-        if ( ! $invoice->get_id() ) {
+        if (!$invoice->get_id()) {
             exit;
         }
 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item_id => $item ) {
-            $items[ $item_id ] = $item->prepare_data_for_invoice_edit_ajax(  $invoice->get_currency()  );
+        foreach ($invoice->get_items() as $item_id => $item) {
+            $items[$item_id] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items' ) );
+        wp_send_json_success(compact('items'));
     }
 
     /**
@@ -487,50 +487,50 @@ 
     public static function edit_invoice_item() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and item details.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['data'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['data'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( trim( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(trim($_POST['post_id']));
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Format the data.
-        $data = wp_list_pluck( $_POST['data'], 'value', 'field' );
+        $data = wp_list_pluck($_POST['data'], 'value', 'field');
 
         // Ensure that we have an item id.
-        if ( empty( $data['id'] ) ) {
+        if (empty($data['id'])) {
             exit;
         }
 
         // Abort if the invoice does not have the specified item.
-        $item = $invoice->get_item( (int) $data['id'] );
+        $item = $invoice->get_item((int) $data['id']);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             exit;
         }
 
         // Update the item.
-        $item->set_price( $data['price'] );
-        $item->set_name( $data['name'] );
-        $item->set_description( $data['description'] );
-        $item->set_quantity( $data['quantity'] );
+        $item->set_price($data['price']);
+        $item->set_name($data['name']);
+        $item->set_description($data['description']);
+        $item->set_quantity($data['quantity']);
 
         // Add it to the invoice.
-        $error = $invoice->add_item( $item );
+        $error = $invoice->add_item($item);
         $alert = false;
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             $alert = $error->get_error_message();
         }
 
@@ -543,11 +543,11 @@ 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item_id => $item ) {
-            $items[ $item_id ] = $item->prepare_data_for_invoice_edit_ajax(  $invoice->get_currency()  );
+        foreach ($invoice->get_items() as $item_id => $item) {
+            $items[$item_id] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items', 'alert' ) );
+        wp_send_json_success(compact('items', 'alert'));
     }
 
     /**
@@ -556,33 +556,33 @@ 
     public static function remove_invoice_item() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and an item.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['item_id'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['item_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( trim( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(trim($_POST['post_id']));
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Abort if the invoice does not have the specified item.
-        $item = $invoice->get_item( (int) $_POST['item_id'] );
+        $item = $invoice->get_item((int) $_POST['item_id']);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             exit;
         }
 
-        $invoice->remove_item( (int) $_POST['item_id'] );
+        $invoice->remove_item((int) $_POST['item_id']);
 
         // Update totals.
         $invoice->recalculate_total();
@@ -593,11 +593,11 @@ 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item_id => $item ) {
-            $items[ $item_id ] = $item->prepare_data_for_invoice_edit_ajax(  $invoice->get_currency()  );
+        foreach ($invoice->get_items() as $item_id => $item) {
+            $items[$item_id] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items' ) );
+        wp_send_json_success(compact('items'));
     }
 
     /**
@@ -606,39 +606,39 @@ 
     public static function add_invoice_items() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and items.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['items'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['items'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( trim( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(trim($_POST['post_id']));
         $alert   = false;
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Add the items.
-        foreach ( $_POST['items'] as $data ) {
+        foreach ($_POST['items'] as $data) {
 
-            $item = new GetPaid_Form_Item( $data[ 'id' ] );
+            $item = new GetPaid_Form_Item($data['id']);
 
-            if ( is_numeric( $data[ 'qty' ] ) && (int) $data[ 'qty' ] > 0 ) {
-                $item->set_quantity( $data[ 'qty' ] );
+            if (is_numeric($data['qty']) && (int) $data['qty'] > 0) {
+                $item->set_quantity($data['qty']);
             }
 
-            if ( $item->get_id() > 0 ) {
-                $error = $invoice->add_item( $item );
+            if ($item->get_id() > 0) {
+                $error = $invoice->add_item($item);
 
-                if ( is_wp_error( $error ) ) {
+                if (is_wp_error($error)) {
                     $alert = $error->get_error_message();
                 }
 
@@ -653,11 +653,11 @@ 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item_id => $item ) {
-            $items[ $item_id ] = $item->prepare_data_for_invoice_edit_ajax( $invoice->get_currency() );
+        foreach ($invoice->get_items() as $item_id => $item) {
+            $items[$item_id] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items', 'alert' ) );
+        wp_send_json_success(compact('items', 'alert'));
     }
 
     /**
@@ -666,15 +666,15 @@ 
     public static function get_invoicing_items() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need a search term.
-        if ( empty( $_GET['search'] ) ) {
-            wp_send_json_success( array() );
+        if (empty($_GET['search'])) {
+            wp_send_json_success(array());
         }
 
         // Retrieve items.
@@ -683,8 +683,8 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
-            's'              => trim( $_GET['search'] ),
+            'post_status'    => array('publish'),
+            's'              => trim($_GET['search']),
             'meta_query'     => array(
                 array(
                     'key'       => '_wpinv_type',
@@ -694,22 +694,22 @@ 
             )
         );
 
-        $items = get_posts( apply_filters( 'getpaid_ajax_invoice_items_query_args', $item_args ) );
+        $items = get_posts(apply_filters('getpaid_ajax_invoice_items_query_args', $item_args));
         $data  = array();
 
 
-        $is_payment_form = ( ! empty( $_GET['post_id'] ) && 'wpi_payment_form' == get_post_type( $_GET['post_id'] ) );
+        $is_payment_form = (!empty($_GET['post_id']) && 'wpi_payment_form' == get_post_type($_GET['post_id']));
 
-        foreach ( $items as $item ) {
-            $item      = new GetPaid_Form_Item( $item );
+        foreach ($items as $item) {
+            $item = new GetPaid_Form_Item($item);
             $data[] = array(
                 'id'        => (int) $item->get_id(),
-                'text'      => strip_tags( $item->get_name() ),
-                'form_data' => $is_payment_form ? $item->prepare_data_for_use( false ) : '',
+                'text'      => strip_tags($item->get_name()),
+                'form_data' => $is_payment_form ? $item->prepare_data_for_use(false) : '',
             );
         }
 
-        wp_send_json_success( $data );
+        wp_send_json_success($data);
 
     }
 
@@ -719,24 +719,24 @@ 
     public static function get_aui_states_field() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // We need a country.
-        if ( empty( $_GET['country'] ) ) {
+        if (empty($_GET['country'])) {
             exit;
         }
 
-        $states = wpinv_get_country_states( trim( $_GET['country'] ) );
-        $state  = isset( $_GET['state'] ) ? trim( $_GET['state'] ) : wpinv_get_default_state();
+        $states = wpinv_get_country_states(trim($_GET['country']));
+        $state  = isset($_GET['state']) ? trim($_GET['state']) : wpinv_get_default_state();
 
-        if ( empty( $states ) ) {
+        if (empty($states)) {
 
             $html = aui()->input(
                 array(
                     'type'        => 'text',
                     'id'          => 'wpinv_state',
                     'name'        => 'wpinv_state',
-                    'label'       => __( 'State', 'invoicing' ),
+                    'label'       => __('State', 'invoicing'),
                     'label_type'  => 'vertical',
                     'placeholder' => 'Liège',
                     'class'       => 'form-control-sm',
@@ -750,9 +750,9 @@ 
                 array(
                     'id'          => 'wpinv_state',
                     'name'        => 'wpinv_state',
-                    'label'       => __( 'State', 'invoicing' ),
+                    'label'       => __('State', 'invoicing'),
                     'label_type'  => 'vertical',
-                    'placeholder' => __( 'Select a state', 'invoicing' ),
+                    'placeholder' => __('Select a state', 'invoicing'),
                     'class'       => 'form-control-sm',
                     'value'       => $state,
                     'options'     => $states,
@@ -766,7 +766,7 @@ 
         wp_send_json_success(
             array(
                 'html'   => $html,
-                'select' => ! empty ( $states )
+                'select' => !empty ($states)
             )
         );
 
@@ -780,46 +780,46 @@ 
     public static function ip_geolocation() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid-ip-location' );
+        check_ajax_referer('getpaid-ip-location');
 
         // IP address.
-        if ( empty( $_GET['ip'] ) || ! rest_is_ip_address( $_GET['ip'] ) ) {
-            _e( 'Invalid IP Address.', 'invoicing' );
+        if (empty($_GET['ip']) || !rest_is_ip_address($_GET['ip'])) {
+            _e('Invalid IP Address.', 'invoicing');
             exit;
         }
 
         // Retrieve location info.
-        $location = getpaid_geolocate_ip_address( $_GET['ip'] );
+        $location = getpaid_geolocate_ip_address($_GET['ip']);
 
-        if ( empty( $location ) ) {
-            _e( 'Unable to find geolocation for the IP Address.', 'invoicing' );
+        if (empty($location)) {
+            _e('Unable to find geolocation for the IP Address.', 'invoicing');
             exit;
         }
 
         // Sorry.
-        extract( $location );
+        extract($location);
 
         // Prepare the address.
         $content = '';
 
-        if ( ! empty( $location['city'] ) ) {
-            $content .=  $location['city']  . ', ';
+        if (!empty($location['city'])) {
+            $content .= $location['city'] . ', ';
         }
         
-        if ( ! empty( $location['region'] ) ) {
-            $content .=  $location['region']  . ', ';
+        if (!empty($location['region'])) {
+            $content .= $location['region'] . ', ';
         }
         
-        $content .=  $location['country'] . ' (' . $location['iso'] . ')';
+        $content .= $location['country'] . ' (' . $location['iso'] . ')';
 
         $location['address'] = $content;
 
-        $content  = '<p>'. sprintf( __( '<b>Address:</b> %s', 'invoicing' ), $content ) . '</p>';
-        $content .= '<p>'. $location['credit'] . '</p>';
+        $content  = '<p>' . sprintf(__('<b>Address:</b> %s', 'invoicing'), $content) . '</p>';
+        $content .= '<p>' . $location['credit'] . '</p>';
 
         $location['content'] = $content;
 
-        wpinv_get_template( 'geolocation.php', $location );
+        wpinv_get_template('geolocation.php', $location);
 
         exit;
     }
@@ -832,11 +832,11 @@ 
     public static function payment_form_refresh_prices() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
@@ -844,18 +844,18 @@ 
         $submission = new GetPaid_Payment_Form_Submission();
 
         // Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
+        if (!empty($submission->last_error)) {
             echo $submission->last_error;
             exit;
         }
 
         // Prepare the response.
-        $response = new GetPaid_Payment_Form_Submission_Refresh_Prices( $submission );
+        $response = new GetPaid_Payment_Form_Submission_Refresh_Prices($submission);
         
         // Filter the response.
-        $response = apply_filters( 'getpaid_payment_form_ajax_refresh_prices', $response->response, $submission );
+        $response = apply_filters('getpaid_payment_form_ajax_refresh_prices', $response->response, $submission);
 
-        wp_send_json_success( $response );
+        wp_send_json_success($response);
     }
 
 }

includes/payments/class-getpaid-payment-forms.php

Indentation +123 added lines, -123 removed lines

@@ -13,128 +13,128 @@
 class GetPaid_Payment_Forms {
 
     /**
-	 * Class constructor
-	 *
-	 */
-	public function __construct() {
-
-		// Update a payment form's revenue whenever an invoice is paid for or refunded.
-		add_action( 'getpaid_invoice_payment_status_changed', array( $this, 'increment_form_revenue' ) );
-		add_action( 'getpaid_invoice_payment_status_reversed', array( $this, 'decrease_form_revenue' ) );
-
-		// Sync form amount whenever invoice statuses change.
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_failed_amount' ), 10, 3 );
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_refunded_amount' ), 10, 3 );
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_cancelled_amount' ), 10, 3 );
-
-	}
-
-	/**
-	 * Increments a form's revenue whenever there is a payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function increment_form_revenue( $invoice ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			$form->set_earned( $form->get_earned() + $invoice->get_total() );
-			$form->save();
-		}
-
-	}
-
-	/**
-	 * Decreases form revenue whenever invoice payment changes.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function decrease_form_revenue( $invoice ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			$form->set_earned( $form->get_earned() - $invoice->get_total() );
-			$form->save();
-		}
-
-	}
-
-	/**
-	 * Updates a form's failed amount.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $from
-	 * @param string $to
-	 */
-	public function update_form_failed_amount( $invoice, $from, $to ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			return;
-		}
-
-		if ( 'wpi-failed' == $from ) {
-			$form->set_failed( $form->get_failed() - $invoice->get_total() );
-			$form->save();
-		}
-
-		if ( 'wpi-failed' == $to ) {
-			$form->set_failed( $form->get_failed() + $invoice->get_total() );
-			$form->save();
-		}
-
-	}
-
-	/**
-	 * Updates a form's refunded amount.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $from
-	 * @param string $to
-	 */
-	public function update_form_refunded_amount( $invoice, $from, $to ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			return;
-		}
-
-		if ( 'wpi-refunded' == $from ) {
-			$form->set_refunded( $form->get_refunded() - $invoice->get_total() );
-			$form->save();
-		}
-
-		if ( 'wpi-refunded' == $to ) {
-			$form->set_refunded( $form->get_refunded() + $invoice->get_total() );
-			$form->save();
-		}
-
-	}
-
-	/**
-	 * Updates a form's cancelled amount.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $from
-	 * @param string $to
-	 */
-	public function update_form_cancelled_amount( $invoice, $from, $to ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			return;
-		}
-
-		if ( 'wpi-cancelled' == $from ) {
-			$form->set_cancelled( $form->get_cancelled() - $invoice->get_total() );
-			$form->save();
-		}
-
-		if ( 'wpi-cancelled' == $to ) {
-			$form->set_cancelled( $form->get_cancelled() + $invoice->get_total() );
-			$form->save();
-		}
-
-	}
+     * Class constructor
+     *
+     */
+    public function __construct() {
+
+        // Update a payment form's revenue whenever an invoice is paid for or refunded.
+        add_action( 'getpaid_invoice_payment_status_changed', array( $this, 'increment_form_revenue' ) );
+        add_action( 'getpaid_invoice_payment_status_reversed', array( $this, 'decrease_form_revenue' ) );
+
+        // Sync form amount whenever invoice statuses change.
+        add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_failed_amount' ), 10, 3 );
+        add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_refunded_amount' ), 10, 3 );
+        add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_cancelled_amount' ), 10, 3 );
+
+    }
+
+    /**
+     * Increments a form's revenue whenever there is a payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function increment_form_revenue( $invoice ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            $form->set_earned( $form->get_earned() + $invoice->get_total() );
+            $form->save();
+        }
+
+    }
+
+    /**
+     * Decreases form revenue whenever invoice payment changes.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function decrease_form_revenue( $invoice ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            $form->set_earned( $form->get_earned() - $invoice->get_total() );
+            $form->save();
+        }
+
+    }
+
+    /**
+     * Updates a form's failed amount.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $from
+     * @param string $to
+     */
+    public function update_form_failed_amount( $invoice, $from, $to ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            return;
+        }
+
+        if ( 'wpi-failed' == $from ) {
+            $form->set_failed( $form->get_failed() - $invoice->get_total() );
+            $form->save();
+        }
+
+        if ( 'wpi-failed' == $to ) {
+            $form->set_failed( $form->get_failed() + $invoice->get_total() );
+            $form->save();
+        }
+
+    }
+
+    /**
+     * Updates a form's refunded amount.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $from
+     * @param string $to
+     */
+    public function update_form_refunded_amount( $invoice, $from, $to ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            return;
+        }
+
+        if ( 'wpi-refunded' == $from ) {
+            $form->set_refunded( $form->get_refunded() - $invoice->get_total() );
+            $form->save();
+        }
+
+        if ( 'wpi-refunded' == $to ) {
+            $form->set_refunded( $form->get_refunded() + $invoice->get_total() );
+            $form->save();
+        }
+
+    }
+
+    /**
+     * Updates a form's cancelled amount.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $from
+     * @param string $to
+     */
+    public function update_form_cancelled_amount( $invoice, $from, $to ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            return;
+        }
+
+        if ( 'wpi-cancelled' == $from ) {
+            $form->set_cancelled( $form->get_cancelled() - $invoice->get_total() );
+            $form->save();
+        }
+
+        if ( 'wpi-cancelled' == $to ) {
+            $form->set_cancelled( $form->get_cancelled() + $invoice->get_total() );
+            $form->save();
+        }
+
+    }
 
 }

Spacing +35 added lines, -35 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment forms controller class
@@ -19,13 +19,13 @@ 
 	public function __construct() {
 
 		// Update a payment form's revenue whenever an invoice is paid for or refunded.
-		add_action( 'getpaid_invoice_payment_status_changed', array( $this, 'increment_form_revenue' ) );
-		add_action( 'getpaid_invoice_payment_status_reversed', array( $this, 'decrease_form_revenue' ) );
+		add_action('getpaid_invoice_payment_status_changed', array($this, 'increment_form_revenue'));
+		add_action('getpaid_invoice_payment_status_reversed', array($this, 'decrease_form_revenue'));
 
 		// Sync form amount whenever invoice statuses change.
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_failed_amount' ), 10, 3 );
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_refunded_amount' ), 10, 3 );
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_cancelled_amount' ), 10, 3 );
+		add_action('getpaid_invoice_status_changed', array($this, 'update_form_failed_amount'), 10, 3);
+		add_action('getpaid_invoice_status_changed', array($this, 'update_form_refunded_amount'), 10, 3);
+		add_action('getpaid_invoice_status_changed', array($this, 'update_form_cancelled_amount'), 10, 3);
 
 	}
 
@@ -34,11 +34,11 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function increment_form_revenue( $invoice ) {
+	public function increment_form_revenue($invoice) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			$form->set_earned( $form->get_earned() + $invoice->get_total() );
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
+			$form->set_earned($form->get_earned() + $invoice->get_total());
 			$form->save();
 		}
 
@@ -49,11 +49,11 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function decrease_form_revenue( $invoice ) {
+	public function decrease_form_revenue($invoice) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			$form->set_earned( $form->get_earned() - $invoice->get_total() );
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
+			$form->set_earned($form->get_earned() - $invoice->get_total());
 			$form->save();
 		}
 
@@ -66,20 +66,20 @@ 
 	 * @param string $from
 	 * @param string $to
 	 */
-	public function update_form_failed_amount( $invoice, $from, $to ) {
+	public function update_form_failed_amount($invoice, $from, $to) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
 			return;
 		}
 
-		if ( 'wpi-failed' == $from ) {
-			$form->set_failed( $form->get_failed() - $invoice->get_total() );
+		if ('wpi-failed' == $from) {
+			$form->set_failed($form->get_failed() - $invoice->get_total());
 			$form->save();
 		}
 
-		if ( 'wpi-failed' == $to ) {
-			$form->set_failed( $form->get_failed() + $invoice->get_total() );
+		if ('wpi-failed' == $to) {
+			$form->set_failed($form->get_failed() + $invoice->get_total());
 			$form->save();
 		}
 
@@ -92,20 +92,20 @@ 
 	 * @param string $from
 	 * @param string $to
 	 */
-	public function update_form_refunded_amount( $invoice, $from, $to ) {
+	public function update_form_refunded_amount($invoice, $from, $to) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
 			return;
 		}
 
-		if ( 'wpi-refunded' == $from ) {
-			$form->set_refunded( $form->get_refunded() - $invoice->get_total() );
+		if ('wpi-refunded' == $from) {
+			$form->set_refunded($form->get_refunded() - $invoice->get_total());
 			$form->save();
 		}
 
-		if ( 'wpi-refunded' == $to ) {
-			$form->set_refunded( $form->get_refunded() + $invoice->get_total() );
+		if ('wpi-refunded' == $to) {
+			$form->set_refunded($form->get_refunded() + $invoice->get_total());
 			$form->save();
 		}
 
@@ -118,20 +118,20 @@ 
 	 * @param string $from
 	 * @param string $to
 	 */
-	public function update_form_cancelled_amount( $invoice, $from, $to ) {
+	public function update_form_cancelled_amount($invoice, $from, $to) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
 			return;
 		}
 
-		if ( 'wpi-cancelled' == $from ) {
-			$form->set_cancelled( $form->get_cancelled() - $invoice->get_total() );
+		if ('wpi-cancelled' == $from) {
+			$form->set_cancelled($form->get_cancelled() - $invoice->get_total());
 			$form->save();
 		}
 
-		if ( 'wpi-cancelled' == $to ) {
-			$form->set_cancelled( $form->get_cancelled() + $invoice->get_total() );
+		if ('wpi-cancelled' == $to) {
+			$form->set_cancelled($form->get_cancelled() + $invoice->get_total());
 			$form->save();
 		}
 

includes/admin/meta-boxes/class-getpaid-meta-box-payment-form.php

Indentation +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -16,10 +16,10 @@ 
 class GetPaid_Meta_Box_Payment_Form {
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
         ?>
         <div id="wpinv-form-builder" class="bsui">
@@ -86,11 +86,11 @@ 
     }
 
     /**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 */
-	public static function save( $post_id ) {
+     * Save meta box data.
+     *
+     * @param int $post_id
+     */
+    public static function save( $post_id ) {
 
         // Prepare the form.
         $form = new GetPaid_Payment_Form( $post_id );
@@ -121,11 +121,11 @@ 
     }
 
     /**
-	 * Converts an array fo form items to objects.
-	 *
-	 * @param array $items
-	 */
-	public static function item_to_objects( $items ) {
+     * Converts an array fo form items to objects.
+     *
+     * @param array $items
+     */
+    public static function item_to_objects( $items ) {
 
         $objects = array();
 

Spacing +25 added lines, -25 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -20,14 +20,14 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
         ?>
         <div id="wpinv-form-builder" class="bsui">
             <div class="row">
                 <div class="col-sm-4">
 
                     <!-- Builder tabs -->
-                    <button class="button button-primary" v-if="active_tab!='new_item'" @click.prevent="active_tab='new_item'"><?php _e( 'Go Back', 'invoicing' ); ?></button>
+                    <button class="button button-primary" v-if="active_tab!='new_item'" @click.prevent="active_tab='new_item'"><?php _e('Go Back', 'invoicing'); ?></button>
 
                     <!-- Builder tab content -->
                     <div class="mt-4">
@@ -35,7 +35,7 @@ 
                         <!-- Available builder elements -->
                         <div class="wpinv-form-builder-tab-pane" v-if="active_tab=='new_item'">
                             <div class="wpinv-form-builder-add-field-types">
-                                <small class='form-text text-muted'><?php _e( 'Add an element by dragging it to the payment form.', 'invoicing' ); ?></small>
+                                <small class='form-text text-muted'><?php _e('Add an element by dragging it to the payment form.', 'invoicing'); ?></small>
                                 <draggable class="section mt-2" style="display: flex; flex-flow: wrap; justify-content: space-between;" v-model="elements" :group="{ name: 'fields', pull: 'clone', put: false }" :sort="false" :clone="addDraggedField" tag="ul" filter=".wpinv-undraggable">
                                     <li v-for="element in elements" class= "wpinv-payment-form-left-fields-field" @click.prevent="addField(element)" :class="{ 'd-none': element.defaults.premade }">
                                         <button class="button btn">
@@ -50,10 +50,10 @@ 
                         <!-- Edit an element -->
                         <div class="wpinv-form-builder-tab-pane" v-if="active_tab=='edit_item'" style="font-size: 14px;">
                             <div class="wpinv-form-builder-edit-field-wrapper">
-                                <?php do_action( 'wpinv_payment_form_edit_element_template', 'active_form_element', $post ); ?>
-                                <?php do_action( 'getpaid_payment_form_edit_element_template', $post ); ?>
+                                <?php do_action('wpinv_payment_form_edit_element_template', 'active_form_element', $post); ?>
+                                <?php do_action('getpaid_payment_form_edit_element_template', $post); ?>
                                 <div>
-                                    <button type="button" class="button button-link button-link-delete" @click.prevent="removeField(active_form_element)" v-show="! active_form_element.premade"><?php _e( 'Delete Element', 'invoicing' ); ?></button>
+                                    <button type="button" class="button button-link button-link-delete" @click.prevent="removeField(active_form_element)" v-show="! active_form_element.premade"><?php _e('Delete Element', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -62,14 +62,14 @@ 
 
                 </div>
                 <div class="col-sm-8 border-left">
-                    <small class='form-text text-muted' v-if='form_elements.length'><?php _e( 'Click on any element to edit or delete it.', 'invoicing' ); ?></small>
-                    <p class='form-text text-muted' v-if='! form_elements.length'><?php _e( 'This form is empty. Add new elements by dragging them from the right.', 'invoicing' ); ?></p>
+                    <small class='form-text text-muted' v-if='form_elements.length'><?php _e('Click on any element to edit or delete it.', 'invoicing'); ?></small>
+                    <p class='form-text text-muted' v-if='! form_elements.length'><?php _e('This form is empty. Add new elements by dragging them from the right.', 'invoicing'); ?></p>
 
                     <draggable class="section bsui" v-model="form_elements" @add="highlightLastDroppedField" group="fields" tag="div" style="min-height: 100%; font-size: 14px;">
                         <div v-for="form_element in form_elements" class="wpinv-form-builder-element-preview" :class="[{ active: active_form_element==form_element &&  active_tab=='edit_item' }, form_element.type]" @click="active_tab = 'edit_item'; active_form_element = form_element">
                             <div class="wpinv-form-builder-element-preview-inner">
                                 <div class="wpinv-payment-form-field-preview-overlay"></div>
-                                <?php do_action( 'wpinv_payment_form_render_element_template', 'form_element', $post ); ?>
+                                <?php do_action('wpinv_payment_form_render_element_template', 'form_element', $post); ?>
                             </div>
                         </div>
                     </draggable>
@@ -82,7 +82,7 @@ 
         </div>
         <?php
 
-        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+        wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
     }
 
     /**
@@ -90,33 +90,33 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public static function save( $post_id ) {
+	public static function save($post_id) {
 
         // Prepare the form.
-        $form = new GetPaid_Payment_Form( $post_id );
+        $form = new GetPaid_Payment_Form($post_id);
 
         // Fetch form items.
-        $form_items = json_decode( wp_unslash( $_POST['wpinv_form_items'] ), true );
+        $form_items = json_decode(wp_unslash($_POST['wpinv_form_items']), true);
 
         // Ensure that we have an array...
-        if ( empty( $form_items ) ) {
+        if (empty($form_items)) {
             $form_items = array();
         }
 
         // Add it to the form.
-        $form->set_items( self::item_to_objects( $form_items ) );
+        $form->set_items(self::item_to_objects($form_items));
 
         // Save form elements.
-        $form_elements = json_decode( wp_unslash( $_POST['wpinv_form_elements'] ), true );
-        if ( empty( $form_elements ) ) {
+        $form_elements = json_decode(wp_unslash($_POST['wpinv_form_elements']), true);
+        if (empty($form_elements)) {
             $form_elements = array();
         }
 
-        $form->set_elements( $form_elements );
+        $form->set_elements($form_elements);
 
         // Persist data to the datastore.
         $form->save();
-        do_action( 'getpaid_payment_form_metabox_save', $post_id, $form );
+        do_action('getpaid_payment_form_metabox_save', $post_id, $form);
 
     }
 
@@ -125,14 +125,14 @@ 
 	 *
 	 * @param array $items
 	 */
-	public static function item_to_objects( $items ) {
+	public static function item_to_objects($items) {
 
         $objects = array();
 
-        foreach ( $items as $item ) {
-            $_item = new GetPaid_Form_Item( $item['id'] );
-            $_item->set_allow_quantities( (bool) $item['allow_quantities'] );
-            $_item->set_is_required( (bool) $item['required'] );
+        foreach ($items as $item) {
+            $_item = new GetPaid_Form_Item($item['id']);
+            $_item->set_allow_quantities((bool) $item['allow_quantities']);
+            $_item->set_is_required((bool) $item['required']);
             $objects[] = $_item;
         }