Inspection of "pdf changes" - AyeCode/invoicing - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( c71c5c...a8c7c0 )

by Brian

created 2020-11-30 13:54 UTC

Status

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -7,20 +7,20 @@  discard block
 block discarded – undo
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Fetch the invoice.
-if ( empty( $invoice ) ) {
-    $invoice = new WPInv_Invoice( $GLOBALS['post'] );
+if (empty($invoice)) {
+    $invoice = new WPInv_Invoice($GLOBALS['post']);
 }
 
 // Abort if it does not exist.
-if ( $invoice->get_id() == 0 ) {
+if ($invoice->get_id() == 0) {
     exit;
 }
 
 // Fires before printing an invoice.
-do_action( 'wpinv_invoice_print_before_display', $invoice );
+do_action('wpinv_invoice_print_before_display', $invoice);
 
 ?><!DOCTYPE html>
 
@@ -29,24 +29,24 @@  discard block
 block discarded – undo
 
     <head>
 
-		<meta charset="<?php bloginfo( 'charset' ); ?>">
+		<meta charset="<?php bloginfo('charset'); ?>">
         <meta name="viewport" content="width=device-width, initial-scale=1.0" >
 
         <meta name="robots" content="noindex,nofollow">
 
 		<link rel="profile" href="https://gmpg.org/xfn/11">
 
-        <title>#<?php echo sanitize_text_field( $invoice->get_number() ); ?></title>
+        <title>#<?php echo sanitize_text_field($invoice->get_number()); ?></title>
 
-        <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_head', $invoice); ?>
 
     </head>
     
 
     <body class="body wpinv wpinv-print" style="font-weight: 400;">
 
-        <?php do_action( 'getpaid_invoice', $invoice ); ?>
-        <?php do_action( 'wpinv_invoice_print_body_end', $invoice ); ?>
+        <?php do_action('getpaid_invoice', $invoice); ?>
+        <?php do_action('wpinv_invoice_print_body_end', $invoice); ?>
 
     </body>
 

Please login to merge, or discard this patch.

includes/class-wpinv.php 2 patches

Indentation +456 added lines, -456 removed lines patch added patch discarded remove patch

@@ -14,485 +14,485 @@  discard block
 block discarded – undo
  */
 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;
-
-	/**
-	 * @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.
-		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
-
-		// Init other objects.
-		$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( 'maxmind', new GetPaid_MaxMind_Geolocation() );
-
-	}
-
-	 /**
-	 * 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( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		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-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' );
-
-		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/geolocation",
-			"$plugin_path/includes/reports",
-			"$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['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' );
-
-		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;
+
+    /**
+     * @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.
+        $GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
+
+        // Init other objects.
+        $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( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+
+    }
+
+        /**
+         * 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( 'init', array( $this, 'maybe_process_ipn' ), 10 );
+        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-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' );
+
+        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/geolocation",
+            "$plugin_path/includes/reports",
+            "$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['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' );
+
+        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() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+        if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
-			}
+            $key  = sanitize_key( $_REQUEST['getpaid-action'] );
+            $data = wp_unslash( $_REQUEST );
+            if ( is_user_logged_in() ) {
+                do_action( "getpaid_authenticated_action_$key", $data );
+            }
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+            do_action( "getpaid_unauthenticated_action_$key", $data );
 
-		}
+        }
 
     }
 
-	public function pre_get_posts( $wp_query ) {
-
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
-		}
-
-		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'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
+            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+        }
+
+        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;">
@@ -508,6 +508,6 @@  discard block
 block discarded – undo
 				</div>
 			</div>
 		';
-	}
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +162 added lines, -162 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Invoicing class.
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
 	 * @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;
 	}
 
 	/**
@@ -66,10 +66,10 @@  discard block
 block discarded – undo
 	 * @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;
@@ -81,23 +81,23 @@  discard block
 block discarded – undo
 	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.
 		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
 
 		// Init other objects.
-		$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( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+		$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('maxmind', new GetPaid_MaxMind_Geolocation());
 
 	}
 
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
 	 * 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;
 	}
 
@@ -117,27 +117,27 @@  discard block
 block discarded – undo
 	 */
 	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( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		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('init', array($this, 'maybe_process_ipn'), 10);
+		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);
 
 	}
 
@@ -145,10 +145,10 @@  discard block
 block discarded – undo
 		/* 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();
 		}
 	}
@@ -158,21 +158,21 @@  discard block
 block discarded – undo
 	 *
 	 * @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');
 	}
 
 	/**
@@ -181,82 +181,82 @@  discard block
 block discarded – undo
 	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-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' );
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+		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-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');
+
+		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');
 	}
 
 	/**
@@ -267,21 +267,21 @@  discard block
 block discarded – undo
 	 * @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(
@@ -296,10 +296,10 @@  discard block
 block discarded – undo
 			"$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;
 			}
 
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
 	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(
@@ -327,12 +327,12 @@  discard block
 block discarded – undo
 			)
 		);
 
-		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);
 
 	}
 
@@ -342,55 +342,55 @@  discard block
 block discarded – undo
 	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['txtComplete']          = __( 'Continue', 'invoicing' );
+		$localize['ajax_url']             = admin_url('admin-ajax.php');
+		$localize['nonce']                = wp_create_nonce('wpinv-nonce');
+		$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');
 
-		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);
 		}
 	}
 
@@ -402,31 +402,31 @@  discard block
 block discarded – undo
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+		if (isset($_REQUEST['getpaid-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
+			$key  = sanitize_key($_REQUEST['getpaid-action']);
+			$data = wp_unslash($_REQUEST);
+			if (is_user_logged_in()) {
+				do_action("getpaid_authenticated_action_$key", $data);
 			}
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+			do_action("getpaid_unauthenticated_action_$key", $data);
 
 		}
 
     }
 
-	public function pre_get_posts( $wp_query ) {
+	public function pre_get_posts($wp_query) {
 
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+		if (!is_admin() && !empty($wp_query->query_vars['post_type']) && getpaid_is_invoice_post_type($wp_query->query_vars['post_type']) && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+			$wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses(false, false, $wp_query->query_vars['post_type']));
 		}
 
 		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');
 	}
 
 	/**
@@ -447,8 +447,8 @@  discard block
 block discarded – undo
 			)
 		);
 
-		foreach ( $widgets as $widget ) {
-			register_widget( $widget );
+		foreach ($widgets as $widget) {
+			register_widget($widget);
 		}
 		
 	}
@@ -459,10 +459,10 @@  discard block
 block discarded – undo
 	 * @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();
 		}
 
@@ -470,24 +470,24 @@  discard block
 block discarded – undo
 		$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);
 
 	}
 
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
 					<div class="modal-dialog modal-dialog-centered modal-lg" role="checkout" style="max-width: 650px;">
 						<div class="modal-content">
 							<div class="modal-body">
-								<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="' . esc_attr__( 'Close', 'invoicing' ) . '">
+								<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="' . esc_attr__('Close', 'invoicing') . '">
 									<i class="fa fa-times" aria-hidden="true"></i>
 								</button>
 								<div class="modal-body-wrapper"></div>

Please login to merge, or discard this patch.

includes/gateways/class-getpaid-bank-transfer-gateway.php 2 patches

Indentation +175 added lines, -175 removed lines patch added patch discarded remove patch

@@ -13,30 +13,30 @@  discard block
 block discarded – undo
 class GetPaid_Bank_Transfer_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'bank_transfer';
 
-	/**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
-	protected $supports = array( 'addons' );
+    /**
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
+    protected $supports = array( 'addons' );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 8;
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 8;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title                = __( 'Direct bank transfer', 'invoicing' );
@@ -44,23 +44,23 @@  discard block
 block discarded – undo
         $this->checkout_button_text = __( 'Proceed', 'invoicing' );
         $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
+        add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
+        add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
+        add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
+        add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Add a transaction id.
         $invoice->set_transaction_id( $invoice->generate_key('trans_') );
@@ -81,66 +81,66 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Output for the order received page.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function thankyou_page( $invoice ) {
+     * Output for the order received page.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    public function thankyou_page( $invoice ) {
 
         if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
+            echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
             if ( ! empty( $this->instructions ) ) {
                 echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
-			}
+            }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
         }
 
-	}
+    }
 
     /**
-	 * Add content to the WPI emails.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param string     $email_type Email format: plain text or HTML.
-	 * @param bool     $sent_to_admin Sent to admin.
-	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+     * Add content to the WPI emails.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param string     $email_type Email format: plain text or HTML.
+     * @param bool     $sent_to_admin Sent to admin.
+     */
+    public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
+            echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+            if ( $this->instructions ) {
+                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
             }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 			
-			echo '</div>';
+            echo '</div>';
 
-		}
+        }
 
     }
     
     /**
-	 * Get bank details and place into a list format.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	protected function bank_details( $invoice ) {
+     * Get bank details and place into a list format.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    protected function bank_details( $invoice ) {
 
-		// Get the invoice country and country $locale.
-		$country = $invoice->get_country();
-		$locale  = $this->get_country_locale();
+        // Get the invoice country and country $locale.
+        $country = $invoice->get_country();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
         $bank_fields = array(
             'ac_name'     => __( 'Account Name', 'invoicing' ),
@@ -169,144 +169,144 @@  discard block
 block discarded – undo
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ) ) . '</h3>' . PHP_EOL;
+        echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ) ) . '</h3>' . PHP_EOL;
 
-		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+        echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
 
-		foreach ( $bank_info as $key => $data ) {
+        foreach ( $bank_info as $key => $data ) {
 
-			$key   = sanitize_html_class( $key );
-			$label = wp_kses_post( $data['label'] );
-			$value = wp_kses_post( wptexturize( $data['value'] ) );
+            $key   = sanitize_html_class( $key );
+            $label = wp_kses_post( $data['label'] );
+            $value = wp_kses_post( wptexturize( $data['value'] ) );
 
-			echo "<tr class='getpaid-bank-transfer-$key'><th>$label</th><td>$value</td></tr>" . PHP_EOL;
-		}
+            echo "<tr class='getpaid-bank-transfer-$key'><th>$label</th><td>$value</td></tr>" . PHP_EOL;
+        }
 
-		echo '</table>';
+        echo '</table>';
 
     }
     
     /**
-	 * Get country locale if localized.
-	 *
-	 * @return array
-	 */
-	public function get_country_locale() {
-
-		if ( empty( $this->locale ) ) {
-
-			// Locale information to be used - only those that are not 'Sort Code'.
-			$this->locale = apply_filters(
-				'getpaid_get_bank_transfer_locale',
-				array(
-					'AU' => array(
-						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
-						),
-					),
-					'CA' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
-						),
-					),
-					'IN' => array(
-						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
-						),
-					),
-					'IT' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
-						),
-					),
-					'NZ' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'SE' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'US' => array(
-						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
-						),
-					),
-					'ZA' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
-						),
-					),
-				)
-			);
-
-		}
-
-		return $this->locale;
-
-	}
-
-	/**
-	 * Filters the gateway settings.
-	 * 
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Get country locale if localized.
+     *
+     * @return array
+     */
+    public function get_country_locale() {
+
+        if ( empty( $this->locale ) ) {
+
+            // Locale information to be used - only those that are not 'Sort Code'.
+            $this->locale = apply_filters(
+                'getpaid_get_bank_transfer_locale',
+                array(
+                    'AU' => array(
+                        'sortcode' => array(
+                            'label' => __( 'BSB', 'invoicing' ),
+                        ),
+                    ),
+                    'CA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank transit number', 'invoicing' ),
+                        ),
+                    ),
+                    'IN' => array(
+                        'sortcode' => array(
+                            'label' => __( 'IFSC', 'invoicing' ),
+                        ),
+                    ),
+                    'IT' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch sort', 'invoicing' ),
+                        ),
+                    ),
+                    'NZ' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'SE' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'US' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Routing number', 'invoicing' ),
+                        ),
+                    ),
+                    'ZA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch code', 'invoicing' ),
+                        ),
+                    ),
+                )
+            );
+
+        }
+
+        return $this->locale;
+
+    }
+
+    /**
+     * Filters the gateway settings.
+     * 
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $admin_settings['worldpay_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['worldpay_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['worldpay_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
 
-		$locale  = $this->get_country_locale();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $country  = wpinv_default_billing_country();
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
-		$admin_settings['bank_transfer_ac_name'] = array(
+        $admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
             'name' => __( 'Account Name', 'invoicing' ),
-		);
+        );
 		
-		$admin_settings['bank_transfer_ac_no'] = array(
+        $admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
             'name' => __( 'Account Number', 'invoicing' ),
-		);
+        );
 		
-		$admin_settings['bank_transfer_bank_name'] = array(
+        $admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
             'name' => __( 'Bank Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ifsc'] = array(
+        $admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
             'name' => __( 'IFSC Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_iban'] = array(
+        $admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
             'name' => __( 'IBAN', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bic'] = array(
+        $admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
             'name' => __( 'BIC/Swift Code', 'invoicing' ),
-		);
+        );
 		
-		$admin_settings['bank_transfer_sort_code'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_sort_code',
-			'name' => $sortcode,
-		);
+        $admin_settings['bank_transfer_sort_code'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_sort_code',
+            'name' => $sortcode,
+        );
 
-		$admin_settings['bank_transfer_info'] = array(
+        $admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
             'name' => __( 'Instructions', 'invoicing' ),
             'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
@@ -316,17 +316,17 @@  discard block
 block discarded – undo
             'rows' => 5
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
-	/**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+    /**
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );
@@ -334,6 +334,6 @@  discard block
 block discarded – undo
 
         $invoice->recalculate_total();
         $invoice->save();
-	}
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Bank transfer Payment Gateway class.
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 	 *
 	 * @var array
 	 */
-	protected $supports = array( 'addons' );
+	protected $supports = array('addons');
 
     /**
 	 * Payment method order.
@@ -39,15 +39,15 @@  discard block
 block discarded – undo
 	public function __construct() {
         parent::__construct();
 
-        $this->title                = __( 'Direct bank transfer', 'invoicing' );
-        $this->method_title         = __( 'Bank transfer', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed', 'invoicing' );
-        $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
+        $this->title                = __('Direct bank transfer', 'invoicing');
+        $this->method_title         = __('Bank transfer', 'invoicing');
+        $this->checkout_button_text = __('Proceed', 'invoicing');
+        $this->instructions         = apply_filters('wpinv_bank_instructions', $this->get_option('info'));
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
+		add_action('wpinv_receipt_end', array($this, 'thankyou_page'));
+		add_action('getpaid_invoice_line_items', array($this, 'thankyou_page'), 40);
+		add_action('wpinv_pdf_content_billing', array($this, 'thankyou_page'), 11);
+		add_action('wpinv_email_invoice_details', array($this, 'email_instructions'), 10, 3);
 
     }
 
@@ -60,23 +60,23 @@  discard block
 block discarded – undo
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Add a transaction id.
-        $invoice->set_transaction_id( $invoice->generate_key('trans_') );
+        $invoice->set_transaction_id($invoice->generate_key('trans_'));
 
         // Set it as pending payment.
-        if ( ! $invoice->needs_payment() ) {
+        if (!$invoice->needs_payment()) {
             $invoice->mark_paid();
-        } else if ( ! $invoice->is_paid() ) {
-            $invoice->set_status( 'wpi-onhold' );
+        } else if (!$invoice->is_paid()) {
+            $invoice->set_status('wpi-onhold');
         }
 
         // Save it.
         $invoice->save();
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -85,17 +85,17 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function thankyou_page( $invoice ) {
+	public function thankyou_page($invoice) {
 
-        if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ('bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
-            if ( ! empty( $this->instructions ) ) {
-                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
+            if (!empty($this->instructions)) {
+                echo wp_kses_post(wpautop(wptexturize($this->instructions)));
 			}
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 
 			echo '</div>';
 
@@ -110,17 +110,17 @@  discard block
 block discarded – undo
 	 * @param string     $email_type Email format: plain text or HTML.
 	 * @param bool     $sent_to_admin Sent to admin.
 	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+	public function email_instructions($invoice, $email_type, $sent_to_admin) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+		if (!$sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+			if ($this->instructions) {
+				echo wp_kses_post(wpautop(wptexturize($this->instructions)) . PHP_EOL);
             }
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 			
 			echo '</div>';
 
@@ -133,51 +133,51 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	protected function bank_details( $invoice ) {
+	protected function bank_details($invoice) {
 
 		// Get the invoice country and country $locale.
 		$country = $invoice->get_country();
 		$locale  = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
         $bank_fields = array(
-            'ac_name'     => __( 'Account Name', 'invoicing' ),
-            'ac_no'       => __( 'Account Number', 'invoicing' ),
-            'bank_name'   => __( 'Bank Name', 'invoicing' ),
-            'ifsc'        => __( 'IFSC code', 'invoicing' ),
-            'iban'        => __( 'IBAN', 'invoicing' ),
-            'bic'         => __( 'BIC/Swift code', 'invoicing' ),
+            'ac_name'     => __('Account Name', 'invoicing'),
+            'ac_no'       => __('Account Number', 'invoicing'),
+            'bank_name'   => __('Bank Name', 'invoicing'),
+            'ifsc'        => __('IFSC code', 'invoicing'),
+            'iban'        => __('IBAN', 'invoicing'),
+            'bic'         => __('BIC/Swift code', 'invoicing'),
             'sort_code'   => $sortcode,
         );
 
         $bank_info = array();
 
-        foreach ( $bank_fields as $field => $label ) {
-            $value = $this->get_option( $field );
+        foreach ($bank_fields as $field => $label) {
+            $value = $this->get_option($field);
 
-            if ( ! empty( $value ) ) {
-                $bank_info[$field] = array( 'label' => $label, 'value' => $value );
+            if (!empty($value)) {
+                $bank_info[$field] = array('label' => $label, 'value' => $value);
             }
 
         }
 
-        $bank_info = apply_filters( 'wpinv_bank_info', $bank_info );
+        $bank_info = apply_filters('wpinv_bank_info', $bank_info);
 
-        if ( empty( $bank_info ) ) {
+        if (empty($bank_info)) {
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ) ) . '</h3>' . PHP_EOL;
+		echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters('wpinv_receipt_bank_details_title', __('Bank Details', 'invoicing')) . '</h3>' . PHP_EOL;
 
 		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
 
-		foreach ( $bank_info as $key => $data ) {
+		foreach ($bank_info as $key => $data) {
 
-			$key   = sanitize_html_class( $key );
-			$label = wp_kses_post( $data['label'] );
-			$value = wp_kses_post( wptexturize( $data['value'] ) );
+			$key   = sanitize_html_class($key);
+			$label = wp_kses_post($data['label']);
+			$value = wp_kses_post(wptexturize($data['value']));
 
 			echo "<tr class='getpaid-bank-transfer-$key'><th>$label</th><td>$value</td></tr>" . PHP_EOL;
 		}
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
 	 */
 	public function get_country_locale() {
 
-		if ( empty( $this->locale ) ) {
+		if (empty($this->locale)) {
 
 			// Locale information to be used - only those that are not 'Sort Code'.
 			$this->locale = apply_filters(
@@ -201,42 +201,42 @@  discard block
 block discarded – undo
 				array(
 					'AU' => array(
 						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
+							'label' => __('BSB', 'invoicing'),
 						),
 					),
 					'CA' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
+							'label' => __('Bank transit number', 'invoicing'),
 						),
 					),
 					'IN' => array(
 						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
+							'label' => __('IFSC', 'invoicing'),
 						),
 					),
 					'IT' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
+							'label' => __('Branch sort', 'invoicing'),
 						),
 					),
 					'NZ' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'SE' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'US' => array(
 						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
+							'label' => __('Routing number', 'invoicing'),
 						),
 					),
 					'ZA' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
+							'label' => __('Branch code', 'invoicing'),
 						),
 					),
 				)
@@ -253,51 +253,51 @@  discard block
 block discarded – undo
 	 * 
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
-        $admin_settings['worldpay_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['worldpay_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['worldpay_desc']['std'] = __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing');
+		$admin_settings['worldpay_active']['desc'] = __('Enable bank transfer', 'invoicing');
 
-		$locale  = $this->get_country_locale();
+		$locale = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
 		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
 		$admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
-            'name' => __( 'Account Name', 'invoicing' ),
+            'name' => __('Account Name', 'invoicing'),
 		);
 		
 		$admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
-            'name' => __( 'Account Number', 'invoicing' ),
+            'name' => __('Account Number', 'invoicing'),
 		);
 		
 		$admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
-            'name' => __( 'Bank Name', 'invoicing' ),
+            'name' => __('Bank Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
-            'name' => __( 'IFSC Code', 'invoicing' ),
+            'name' => __('IFSC Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
-            'name' => __( 'IBAN', 'invoicing' ),
+            'name' => __('IBAN', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
-            'name' => __( 'BIC/Swift Code', 'invoicing' ),
+            'name' => __('BIC/Swift Code', 'invoicing'),
 		);
 		
 		$admin_settings['bank_transfer_sort_code'] = array(
@@ -308,10 +308,10 @@  discard block
 block discarded – undo
 
 		$admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
-            'name' => __( 'Instructions', 'invoicing' ),
-            'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
+            'name' => __('Instructions', 'invoicing'),
+            'desc' => __('Instructions that will be added to the thank you page and emails.', 'invoicing'),
             'type' => 'textarea',
-            'std'  => __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' ),
+            'std'  => __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing'),
             'cols' => 50,
             'rows' => 5
         );
@@ -326,10 +326,10 @@  discard block
 block discarded – undo
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();

Please login to merge, or discard this patch.

		@@ -7,20 +7,20 @@ discard block
		block discarded – undo
7	7	* @version 1.0.19
8	8	*/
9	9
10		-defined( 'ABSPATH' ) \|\| exit;
	10	+defined('ABSPATH') \|\| exit;
11	11
12	12	// Fetch the invoice.
13		-if ( empty( $invoice ) ) {
14		- $invoice = new WPInv_Invoice( $GLOBALS['post'] );
	13	+if (empty($invoice)) {
	14	+ $invoice = new WPInv_Invoice($GLOBALS['post']);
15	15	}
16	16
17	17	// Abort if it does not exist.
18		-if ( $invoice->get_id() == 0 ) {
	18	+if ($invoice->get_id() == 0) {
19	19	exit;
20	20	}
21	21
22	22	// Fires before printing an invoice.
23		-do_action( 'wpinv_invoice_print_before_display', $invoice );
	23	+do_action('wpinv_invoice_print_before_display', $invoice);
24	24
25	25	?><!DOCTYPE html>
26	26
		@@ -29,24 +29,24 @@ discard block
		block discarded – undo
29	29
30	30	<head>
31	31
32		- <meta charset="<?php bloginfo( 'charset' ); ?>">
	32	+ <meta charset="<?php bloginfo('charset'); ?>">
33	33	<meta name="viewport" content="width=device-width, initial-scale=1.0" >
34	34
35	35	<meta name="robots" content="noindex,nofollow">
36	36
37	37	<link rel="profile" href="https://gmpg.org/xfn/11">
38	38
39		- <title>#<?php echo sanitize_text_field( $invoice->get_number() ); ?></title>
	39	+ <title>#<?php echo sanitize_text_field($invoice->get_number()); ?></title>
40	40
41		- <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
	41	+ <?php do_action('wpinv_invoice_print_head', $invoice); ?>
42	42
43	43	</head>
44	44
45	45
46	46	<body class="body wpinv wpinv-print" style="font-weight: 400;">
47	47
48		- <?php do_action( 'getpaid_invoice', $invoice ); ?>
49		- <?php do_action( 'wpinv_invoice_print_body_end', $invoice ); ?>
	48	+ <?php do_action('getpaid_invoice', $invoice); ?>
	49	+ <?php do_action('wpinv_invoice_print_body_end', $invoice); ?>
50	50
51	51	</body>
52	52

		@@ -13,30 +13,30 @@ discard block
		block discarded – undo
13	13	class GetPaid_Bank_Transfer_Gateway extends GetPaid_Payment_Gateway {
14	14
15	15	/**
16		- * Payment method id.
17		- *
18		- * @var string
19		- */
	16	+ * Payment method id.
	17	+ *
	18	+ * @var string
	19	+ */
20	20	public $id = 'bank_transfer';
21	21
22		- /**
23		- * An array of features that this gateway supports.
24		- *
25		- * @var array
26		- */
27		- protected $supports = array( 'addons' );
	22	+ /**
	23	+ * An array of features that this gateway supports.
	24	+ *
	25	+ * @var array
	26	+ */
	27	+ protected $supports = array( 'addons' );
28	28
29	29	/**
30		- * Payment method order.
31		- *
32		- * @var int
33		- */
34		- public $order = 8;
	30	+ * Payment method order.
	31	+ *
	32	+ * @var int
	33	+ */
	34	+ public $order = 8;
35	35
36	36	/**
37		- * Class constructor.
38		- */
39		- public function __construct() {
	37	+ * Class constructor.
	38	+ */
	39	+ public function __construct() {
40	40	parent::__construct();
41	41
42	42	$this->title = __( 'Direct bank transfer', 'invoicing' );
		@@ -44,23 +44,23 @@ discard block
		block discarded – undo
44	44	$this->checkout_button_text = __( 'Proceed', 'invoicing' );
45	45	$this->instructions = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
46	46
47		- add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
48		- add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
49		- add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
50		- add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
	47	+ add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
	48	+ add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
	49	+ add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
	50	+ add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
51	51
52	52	}
53	53
54	54	/**
55		- * Process Payment.
56		- *
57		- *
58		- * @param WPInv_Invoice $invoice Invoice.
59		- * @param array $submission_data Posted checkout fields.
60		- * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
61		- * @return array
62		- */
63		- public function process_payment( $invoice, $submission_data, $submission ) {
	55	+ * Process Payment.
	56	+ *
	57	+ *
	58	+ * @param WPInv_Invoice $invoice Invoice.
	59	+ * @param array $submission_data Posted checkout fields.
	60	+ * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
	61	+ * @return array
	62	+ */
	63	+ public function process_payment( $invoice, $submission_data, $submission ) {
64	64
65	65	// Add a transaction id.
66	66	$invoice->set_transaction_id( $invoice->generate_key('trans_') );
		@@ -81,66 +81,66 @@ discard block
		block discarded – undo
81	81	}
82	82
83	83	/**
84		- * Output for the order received page.
85		- *
86		- * @param WPInv_Invoice $invoice Invoice.
87		- */
88		- public function thankyou_page( $invoice ) {
	84	+ * Output for the order received page.
	85	+ *
	86	+ * @param WPInv_Invoice $invoice Invoice.
	87	+ */
	88	+ public function thankyou_page( $invoice ) {
89	89
90	90	if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
91	91
92		- echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
	92	+ echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
93	93
94	94	if ( ! empty( $this->instructions ) ) {
95	95	echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
96		- }
	96	+ }
97	97
98		- $this->bank_details( $invoice );
	98	+ $this->bank_details( $invoice );
99	99
100		- echo '</div>';
	100	+ echo '</div>';
101	101
102	102	}
103	103
104		- }
	104	+ }
105	105
106	106	/**
107		- * Add content to the WPI emails.
108		- *
109		- * @param WPInv_Invoice $invoice Invoice.
110		- * @param string $email_type Email format: plain text or HTML.
111		- * @param bool $sent_to_admin Sent to admin.
112		- */
113		- public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
	107	+ * Add content to the WPI emails.
	108	+ *
	109	+ * @param WPInv_Invoice $invoice Invoice.
	110	+ * @param string $email_type Email format: plain text or HTML.
	111	+ * @param bool $sent_to_admin Sent to admin.
	112	+ */
	113	+ public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
114	114
115		- if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
	115	+ if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
116	116
117		- echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
	117	+ echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
118	118
119		- if ( $this->instructions ) {
120		- echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
	119	+ if ( $this->instructions ) {
	120	+ echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
121	121	}
122	122
123		- $this->bank_details( $invoice );
	123	+ $this->bank_details( $invoice );
124	124
125		- echo '</div>';
	125	+ echo '</div>';
126	126
127		- }
	127	+ }
128	128
129	129	}
130	130
131	131	/**
132		- * Get bank details and place into a list format.
133		- *
134		- * @param WPInv_Invoice $invoice Invoice.
135		- */
136		- protected function bank_details( $invoice ) {
	132	+ * Get bank details and place into a list format.
	133	+ *
	134	+ * @param WPInv_Invoice $invoice Invoice.
	135	+ */
	136	+ protected function bank_details( $invoice ) {
137	137
138		- // Get the invoice country and country $locale.
139		- $country = $invoice->get_country();
140		- $locale = $this->get_country_locale();
	138	+ // Get the invoice country and country $locale.
	139	+ $country = $invoice->get_country();
	140	+ $locale = $this->get_country_locale();
141	141
142		- // Get sortcode label in the $locale array and use appropriate one.
143		- $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
	142	+ // Get sortcode label in the $locale array and use appropriate one.
	143	+ $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
144	144
145	145	$bank_fields = array(
146	146	'ac_name' => __( 'Account Name', 'invoicing' ),
		@@ -169,144 +169,144 @@ discard block
		block discarded – undo
169	169	return;
170	170	}
171	171
172		- echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ) ) . '</h3>' . PHP_EOL;
	172	+ echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ) ) . '</h3>' . PHP_EOL;
173	173
174		- echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
	174	+ echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
175	175
176		- foreach ( $bank_info as $key => $data ) {
	176	+ foreach ( $bank_info as $key => $data ) {
177	177
178		- $key = sanitize_html_class( $key );
179		- $label = wp_kses_post( $data['label'] );
180		- $value = wp_kses_post( wptexturize( $data['value'] ) );
	178	+ $key = sanitize_html_class( $key );
	179	+ $label = wp_kses_post( $data['label'] );
	180	+ $value = wp_kses_post( wptexturize( $data['value'] ) );
181	181
182		- echo "<tr class='getpaid-bank-transfer-$key'><th>$label</th><td>$value</td></tr>" . PHP_EOL;
183		- }
	182	+ echo "<tr class='getpaid-bank-transfer-$key'><th>$label</th><td>$value</td></tr>" . PHP_EOL;
	183	+ }
184	184
185		- echo '</table>';
	185	+ echo '</table>';
186	186
187	187	}
188	188
189	189	/**
190		- * Get country locale if localized.
191		- *
192		- * @return array
193		- */
194		- public function get_country_locale() {
195		-
196		- if ( empty( $this->locale ) ) {
197		-
198		- // Locale information to be used - only those that are not 'Sort Code'.
199		- $this->locale = apply_filters(
200		- 'getpaid_get_bank_transfer_locale',
201		- array(
202		- 'AU' => array(
203		- 'sortcode' => array(
204		- 'label' => __( 'BSB', 'invoicing' ),
205		- ),
206		- ),
207		- 'CA' => array(
208		- 'sortcode' => array(
209		- 'label' => __( 'Bank transit number', 'invoicing' ),
210		- ),
211		- ),
212		- 'IN' => array(
213		- 'sortcode' => array(
214		- 'label' => __( 'IFSC', 'invoicing' ),
215		- ),
216		- ),
217		- 'IT' => array(
218		- 'sortcode' => array(
219		- 'label' => __( 'Branch sort', 'invoicing' ),
220		- ),
221		- ),
222		- 'NZ' => array(
223		- 'sortcode' => array(
224		- 'label' => __( 'Bank code', 'invoicing' ),
225		- ),
226		- ),
227		- 'SE' => array(
228		- 'sortcode' => array(
229		- 'label' => __( 'Bank code', 'invoicing' ),
230		- ),
231		- ),
232		- 'US' => array(
233		- 'sortcode' => array(
234		- 'label' => __( 'Routing number', 'invoicing' ),
235		- ),
236		- ),
237		- 'ZA' => array(
238		- 'sortcode' => array(
239		- 'label' => __( 'Branch code', 'invoicing' ),
240		- ),
241		- ),
242		- )
243		- );
244		-
245		- }
246		-
247		- return $this->locale;
248		-
249		- }
250		-
251		- /**
252		- * Filters the gateway settings.
253		- *
254		- * @param array $admin_settings
255		- */
256		- public function admin_settings( $admin_settings ) {
	190	+ * Get country locale if localized.
	191	+ *
	192	+ * @return array
	193	+ */
	194	+ public function get_country_locale() {
	195	+
	196	+ if ( empty( $this->locale ) ) {
	197	+
	198	+ // Locale information to be used - only those that are not 'Sort Code'.
	199	+ $this->locale = apply_filters(
	200	+ 'getpaid_get_bank_transfer_locale',
	201	+ array(
	202	+ 'AU' => array(
	203	+ 'sortcode' => array(
	204	+ 'label' => __( 'BSB', 'invoicing' ),
	205	+ ),
	206	+ ),
	207	+ 'CA' => array(
	208	+ 'sortcode' => array(
	209	+ 'label' => __( 'Bank transit number', 'invoicing' ),
	210	+ ),
	211	+ ),
	212	+ 'IN' => array(
	213	+ 'sortcode' => array(
	214	+ 'label' => __( 'IFSC', 'invoicing' ),
	215	+ ),
	216	+ ),
	217	+ 'IT' => array(
	218	+ 'sortcode' => array(
	219	+ 'label' => __( 'Branch sort', 'invoicing' ),
	220	+ ),
	221	+ ),
	222	+ 'NZ' => array(
	223	+ 'sortcode' => array(
	224	+ 'label' => __( 'Bank code', 'invoicing' ),
	225	+ ),
	226	+ ),
	227	+ 'SE' => array(
	228	+ 'sortcode' => array(
	229	+ 'label' => __( 'Bank code', 'invoicing' ),
	230	+ ),
	231	+ ),
	232	+ 'US' => array(
	233	+ 'sortcode' => array(
	234	+ 'label' => __( 'Routing number', 'invoicing' ),
	235	+ ),
	236	+ ),
	237	+ 'ZA' => array(
	238	+ 'sortcode' => array(
	239	+ 'label' => __( 'Branch code', 'invoicing' ),
	240	+ ),
	241	+ ),
	242	+ )
	243	+ );
	244	+
	245	+ }
	246	+
	247	+ return $this->locale;
	248	+
	249	+ }
	250	+
	251	+ /**
	252	+ * Filters the gateway settings.
	253	+ *
	254	+ * @param array $admin_settings
	255	+ */
	256	+ public function admin_settings( $admin_settings ) {
257	257
258	258	$admin_settings['worldpay_desc']['std'] = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
259		- $admin_settings['worldpay_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
	259	+ $admin_settings['worldpay_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
260	260
261		- $locale = $this->get_country_locale();
	261	+ $locale = $this->get_country_locale();
262	262
263		- // Get sortcode label in the $locale array and use appropriate one.
264		- $country = wpinv_default_billing_country();
265		- $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
	263	+ // Get sortcode label in the $locale array and use appropriate one.
	264	+ $country = wpinv_default_billing_country();
	265	+ $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
266	266
267		- $admin_settings['bank_transfer_ac_name'] = array(
	267	+ $admin_settings['bank_transfer_ac_name'] = array(
268	268	'type' => 'text',
269	269	'id' => 'bank_transfer_ac_name',
270	270	'name' => __( 'Account Name', 'invoicing' ),
271		- );
	271	+ );
272	272
273		- $admin_settings['bank_transfer_ac_no'] = array(
	273	+ $admin_settings['bank_transfer_ac_no'] = array(
274	274	'type' => 'text',
275	275	'id' => 'bank_transfer_ac_no',
276	276	'name' => __( 'Account Number', 'invoicing' ),
277		- );
	277	+ );
278	278
279		- $admin_settings['bank_transfer_bank_name'] = array(
	279	+ $admin_settings['bank_transfer_bank_name'] = array(
280	280	'type' => 'text',
281	281	'id' => 'bank_transfer_bank_name',
282	282	'name' => __( 'Bank Name', 'invoicing' ),
283		- );
	283	+ );
284	284
285		- $admin_settings['bank_transfer_ifsc'] = array(
	285	+ $admin_settings['bank_transfer_ifsc'] = array(
286	286	'type' => 'text',
287	287	'id' => 'bank_transfer_ifsc',
288	288	'name' => __( 'IFSC Code', 'invoicing' ),
289		- );
	289	+ );
290	290
291		- $admin_settings['bank_transfer_iban'] = array(
	291	+ $admin_settings['bank_transfer_iban'] = array(
292	292	'type' => 'text',
293	293	'id' => 'bank_transfer_iban',
294	294	'name' => __( 'IBAN', 'invoicing' ),
295		- );
	295	+ );
296	296
297		- $admin_settings['bank_transfer_bic'] = array(
	297	+ $admin_settings['bank_transfer_bic'] = array(
298	298	'type' => 'text',
299	299	'id' => 'bank_transfer_bic',
300	300	'name' => __( 'BIC/Swift Code', 'invoicing' ),
301		- );
	301	+ );
302	302
303		- $admin_settings['bank_transfer_sort_code'] = array(
304		- 'type' => 'text',
305		- 'id' => 'bank_transfer_sort_code',
306		- 'name' => $sortcode,
307		- );
	303	+ $admin_settings['bank_transfer_sort_code'] = array(
	304	+ 'type' => 'text',
	305	+ 'id' => 'bank_transfer_sort_code',
	306	+ 'name' => $sortcode,
	307	+ );
308	308
309		- $admin_settings['bank_transfer_info'] = array(
	309	+ $admin_settings['bank_transfer_info'] = array(
310	310	'id' => 'bank_transfer_info',
311	311	'name' => __( 'Instructions', 'invoicing' ),
312	312	'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
		@@ -316,17 +316,17 @@ discard block
		block discarded – undo
316	316	'rows' => 5
317	317	);
318	318
319		- return $admin_settings;
320		- }
	319	+ return $admin_settings;
	320	+ }
321	321
322		- /**
323		- * Processes invoice addons.
324		- *
325		- * @param WPInv_Invoice $invoice
326		- * @param GetPaid_Form_Item[] $items
327		- * @return WPInv_Invoice
328		- */
329		- public function process_addons( $invoice, $items ) {
	322	+ /**
	323	+ * Processes invoice addons.
	324	+ *
	325	+ * @param WPInv_Invoice $invoice
	326	+ * @param GetPaid_Form_Item[] $items
	327	+ * @return WPInv_Invoice
	328	+ */
	329	+ public function process_addons( $invoice, $items ) {
330	330
331	331	foreach ( $items as $item ) {
332	332	$invoice->add_item( $item );
		@@ -334,6 +334,6 @@ discard block
		block discarded – undo
334	334
335	335	$invoice->recalculate_total();
336	336	$invoice->save();
337		- }
	337	+ }
338	338
339	339	}

		@@ -4,7 +4,7 @@ discard block
		block discarded – undo
4	4	*
5	5	*/
6	6
7		-defined( 'ABSPATH' ) \|\| exit;
	7	+defined('ABSPATH') \|\| exit;
8	8
9	9	/**
10	10	* Bank transfer Payment Gateway class.
		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	*
25	25	* @var array
26	26	*/
27		- protected $supports = array( 'addons' );
	27	+ protected $supports = array('addons');
28	28
29	29	/**
30	30	* Payment method order.
		@@ -39,15 +39,15 @@ discard block
		block discarded – undo
39	39	public function __construct() {
40	40	parent::__construct();
41	41
42		- $this->title = __( 'Direct bank transfer', 'invoicing' );
43		- $this->method_title = __( 'Bank transfer', 'invoicing' );
44		- $this->checkout_button_text = __( 'Proceed', 'invoicing' );
45		- $this->instructions = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
	42	+ $this->title = __('Direct bank transfer', 'invoicing');
	43	+ $this->method_title = __('Bank transfer', 'invoicing');
	44	+ $this->checkout_button_text = __('Proceed', 'invoicing');
	45	+ $this->instructions = apply_filters('wpinv_bank_instructions', $this->get_option('info'));
46	46
47		- add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
48		- add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
49		- add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
50		- add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
	47	+ add_action('wpinv_receipt_end', array($this, 'thankyou_page'));
	48	+ add_action('getpaid_invoice_line_items', array($this, 'thankyou_page'), 40);
	49	+ add_action('wpinv_pdf_content_billing', array($this, 'thankyou_page'), 11);
	50	+ add_action('wpinv_email_invoice_details', array($this, 'email_instructions'), 10, 3);
51	51
52	52	}
53	53
		@@ -60,23 +60,23 @@ discard block
		block discarded – undo
60	60	* @param GetPaid_Payment_Form_Submission $submission Checkout submission.
61	61	* @return array
62	62	*/
63		- public function process_payment( $invoice, $submission_data, $submission ) {
	63	+ public function process_payment($invoice, $submission_data, $submission) {
64	64
65	65	// Add a transaction id.
66		- $invoice->set_transaction_id( $invoice->generate_key('trans_') );
	66	+ $invoice->set_transaction_id($invoice->generate_key('trans_'));
67	67
68	68	// Set it as pending payment.
69		- if ( ! $invoice->needs_payment() ) {
	69	+ if (!$invoice->needs_payment()) {
70	70	$invoice->mark_paid();
71		- } else if ( ! $invoice->is_paid() ) {
72		- $invoice->set_status( 'wpi-onhold' );
	71	+ } else if (!$invoice->is_paid()) {
	72	+ $invoice->set_status('wpi-onhold');
73	73	}
74	74
75	75	// Save it.
76	76	$invoice->save();
77	77
78	78	// Send to the success page.
79		- wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
	79	+ wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
80	80
81	81	}
82	82
		@@ -85,17 +85,17 @@ discard block
		block discarded – undo
85	85	*
86	86	* @param WPInv_Invoice $invoice Invoice.
87	87	*/
88		- public function thankyou_page( $invoice ) {
	88	+ public function thankyou_page($invoice) {
89	89
90		- if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
	90	+ if ('bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
91	91
92	92	echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
93	93
94		- if ( ! empty( $this->instructions ) ) {
95		- echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
	94	+ if (!empty($this->instructions)) {
	95	+ echo wp_kses_post(wpautop(wptexturize($this->instructions)));
96	96	}
97	97
98		- $this->bank_details( $invoice );
	98	+ $this->bank_details($invoice);
99	99
100	100	echo '</div>';
101	101
		@@ -110,17 +110,17 @@ discard block
		block discarded – undo
110	110	* @param string $email_type Email format: plain text or HTML.
111	111	* @param bool $sent_to_admin Sent to admin.
112	112	*/
113		- public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
	113	+ public function email_instructions($invoice, $email_type, $sent_to_admin) {
114	114
115		- if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
	115	+ if (!$sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
116	116
117	117	echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
118	118
119		- if ( $this->instructions ) {
120		- echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
	119	+ if ($this->instructions) {
	120	+ echo wp_kses_post(wpautop(wptexturize($this->instructions)) . PHP_EOL);
121	121	}
122	122
123		- $this->bank_details( $invoice );
	123	+ $this->bank_details($invoice);
124	124
125	125	echo '</div>';
126	126
		@@ -133,51 +133,51 @@ discard block
		block discarded – undo
133	133	*
134	134	* @param WPInv_Invoice $invoice Invoice.
135	135	*/
136		- protected function bank_details( $invoice ) {
	136	+ protected function bank_details($invoice) {
137	137
138	138	// Get the invoice country and country $locale.
139	139	$country = $invoice->get_country();
140	140	$locale = $this->get_country_locale();
141	141
142	142	// Get sortcode label in the $locale array and use appropriate one.
143		- $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
	143	+ $sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
144	144
145	145	$bank_fields = array(
146		- 'ac_name' => __( 'Account Name', 'invoicing' ),
147		- 'ac_no' => __( 'Account Number', 'invoicing' ),
148		- 'bank_name' => __( 'Bank Name', 'invoicing' ),
149		- 'ifsc' => __( 'IFSC code', 'invoicing' ),
150		- 'iban' => __( 'IBAN', 'invoicing' ),
151		- 'bic' => __( 'BIC/Swift code', 'invoicing' ),
	146	+ 'ac_name' => __('Account Name', 'invoicing'),
	147	+ 'ac_no' => __('Account Number', 'invoicing'),
	148	+ 'bank_name' => __('Bank Name', 'invoicing'),
	149	+ 'ifsc' => __('IFSC code', 'invoicing'),
	150	+ 'iban' => __('IBAN', 'invoicing'),
	151	+ 'bic' => __('BIC/Swift code', 'invoicing'),
152	152	'sort_code' => $sortcode,
153	153	);
154	154
155	155	$bank_info = array();
156	156
157		- foreach ( $bank_fields as $field => $label ) {
158		- $value = $this->get_option( $field );
	157	+ foreach ($bank_fields as $field => $label) {
	158	+ $value = $this->get_option($field);
159	159
160		- if ( ! empty( $value ) ) {
161		- $bank_info[$field] = array( 'label' => $label, 'value' => $value );
	160	+ if (!empty($value)) {
	161	+ $bank_info[$field] = array('label' => $label, 'value' => $value);
162	162	}
163	163
164	164	}
165	165
166		- $bank_info = apply_filters( 'wpinv_bank_info', $bank_info );
	166	+ $bank_info = apply_filters('wpinv_bank_info', $bank_info);
167	167
168		- if ( empty( $bank_info ) ) {
	168	+ if (empty($bank_info)) {
169	169	return;
170	170	}
171	171
172		- echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ) ) . '</h3>' . PHP_EOL;
	172	+ echo '<h3 class="getpaid-bank-transfer-title"> ' . apply_filters('wpinv_receipt_bank_details_title', __('Bank Details', 'invoicing')) . '</h3>' . PHP_EOL;
173	173
174	174	echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
175	175
176		- foreach ( $bank_info as $key => $data ) {
	176	+ foreach ($bank_info as $key => $data) {
177	177
178		- $key = sanitize_html_class( $key );
179		- $label = wp_kses_post( $data['label'] );
180		- $value = wp_kses_post( wptexturize( $data['value'] ) );
	178	+ $key = sanitize_html_class($key);
	179	+ $label = wp_kses_post($data['label']);
	180	+ $value = wp_kses_post(wptexturize($data['value']));
181	181
182	182	echo "<tr class='getpaid-bank-transfer-$key'><th>$label</th><td>$value</td></tr>" . PHP_EOL;
183	183	}
		@@ -193,7 +193,7 @@ discard block
		block discarded – undo
193	193	*/
194	194	public function get_country_locale() {
195	195
196		- if ( empty( $this->locale ) ) {
	196	+ if (empty($this->locale)) {
197	197
198	198	// Locale information to be used - only those that are not 'Sort Code'.
199	199	$this->locale = apply_filters(
		@@ -201,42 +201,42 @@ discard block
		block discarded – undo
201	201	array(
202	202	'AU' => array(
203	203	'sortcode' => array(
204		- 'label' => __( 'BSB', 'invoicing' ),
	204	+ 'label' => __('BSB', 'invoicing'),
205	205	),
206	206	),
207	207	'CA' => array(
208	208	'sortcode' => array(
209		- 'label' => __( 'Bank transit number', 'invoicing' ),
	209	+ 'label' => __('Bank transit number', 'invoicing'),
210	210	),
211	211	),
212	212	'IN' => array(
213	213	'sortcode' => array(
214		- 'label' => __( 'IFSC', 'invoicing' ),
	214	+ 'label' => __('IFSC', 'invoicing'),
215	215	),
216	216	),
217	217	'IT' => array(
218	218	'sortcode' => array(
219		- 'label' => __( 'Branch sort', 'invoicing' ),
	219	+ 'label' => __('Branch sort', 'invoicing'),
220	220	),
221	221	),
222	222	'NZ' => array(
223	223	'sortcode' => array(
224		- 'label' => __( 'Bank code', 'invoicing' ),
	224	+ 'label' => __('Bank code', 'invoicing'),
225	225	),
226	226	),
227	227	'SE' => array(
228	228	'sortcode' => array(
229		- 'label' => __( 'Bank code', 'invoicing' ),
	229	+ 'label' => __('Bank code', 'invoicing'),
230	230	),
231	231	),
232	232	'US' => array(
233	233	'sortcode' => array(
234		- 'label' => __( 'Routing number', 'invoicing' ),
	234	+ 'label' => __('Routing number', 'invoicing'),
235	235	),
236	236	),
237	237	'ZA' => array(
238	238	'sortcode' => array(
239		- 'label' => __( 'Branch code', 'invoicing' ),
	239	+ 'label' => __('Branch code', 'invoicing'),
240	240	),
241	241	),
242	242	)
		@@ -253,51 +253,51 @@ discard block
		block discarded – undo
253	253	*
254	254	* @param array $admin_settings
255	255	*/
256		- public function admin_settings( $admin_settings ) {
	256	+ public function admin_settings($admin_settings) {
257	257
258		- $admin_settings['worldpay_desc']['std'] = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
259		- $admin_settings['worldpay_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
	258	+ $admin_settings['worldpay_desc']['std'] = __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing');
	259	+ $admin_settings['worldpay_active']['desc'] = __('Enable bank transfer', 'invoicing');
260	260
261		- $locale = $this->get_country_locale();
	261	+ $locale = $this->get_country_locale();
262	262
263	263	// Get sortcode label in the $locale array and use appropriate one.
264	264	$country = wpinv_default_billing_country();
265		- $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
	265	+ $sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
266	266
267	267	$admin_settings['bank_transfer_ac_name'] = array(
268	268	'type' => 'text',
269	269	'id' => 'bank_transfer_ac_name',
270		- 'name' => __( 'Account Name', 'invoicing' ),
	270	+ 'name' => __('Account Name', 'invoicing'),
271	271	);
272	272
273	273	$admin_settings['bank_transfer_ac_no'] = array(
274	274	'type' => 'text',
275	275	'id' => 'bank_transfer_ac_no',
276		- 'name' => __( 'Account Number', 'invoicing' ),
	276	+ 'name' => __('Account Number', 'invoicing'),
277	277	);
278	278
279	279	$admin_settings['bank_transfer_bank_name'] = array(
280	280	'type' => 'text',
281	281	'id' => 'bank_transfer_bank_name',
282		- 'name' => __( 'Bank Name', 'invoicing' ),
	282	+ 'name' => __('Bank Name', 'invoicing'),
283	283	);
284	284
285	285	$admin_settings['bank_transfer_ifsc'] = array(
286	286	'type' => 'text',
287	287	'id' => 'bank_transfer_ifsc',
288		- 'name' => __( 'IFSC Code', 'invoicing' ),
	288	+ 'name' => __('IFSC Code', 'invoicing'),
289	289	);
290	290
291	291	$admin_settings['bank_transfer_iban'] = array(
292	292	'type' => 'text',
293	293	'id' => 'bank_transfer_iban',
294		- 'name' => __( 'IBAN', 'invoicing' ),
	294	+ 'name' => __('IBAN', 'invoicing'),
295	295	);
296	296
297	297	$admin_settings['bank_transfer_bic'] = array(
298	298	'type' => 'text',
299	299	'id' => 'bank_transfer_bic',
300		- 'name' => __( 'BIC/Swift Code', 'invoicing' ),
	300	+ 'name' => __('BIC/Swift Code', 'invoicing'),
301	301	);
302	302
303	303	$admin_settings['bank_transfer_sort_code'] = array(
		@@ -308,10 +308,10 @@ discard block
		block discarded – undo
308	308
309	309	$admin_settings['bank_transfer_info'] = array(
310	310	'id' => 'bank_transfer_info',
311		- 'name' => __( 'Instructions', 'invoicing' ),
312		- 'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
	311	+ 'name' => __('Instructions', 'invoicing'),
	312	+ 'desc' => __('Instructions that will be added to the thank you page and emails.', 'invoicing'),
313	313	'type' => 'textarea',
314		- 'std' => __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' ),
	314	+ 'std' => __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing'),
315	315	'cols' => 50,
316	316	'rows' => 5
317	317	);
		@@ -326,10 +326,10 @@ discard block
		block discarded – undo
326	326	* @param GetPaid_Form_Item[] $items
327	327	* @return WPInv_Invoice
328	328	*/
329		- public function process_addons( $invoice, $items ) {
	329	+ public function process_addons($invoice, $items) {
330	330
331		- foreach ( $items as $item ) {
332		- $invoice->add_item( $item );
	331	+ foreach ($items as $item) {
	332	+ $invoice->add_item($item);
333	333	}
334	334
335	335	$invoice->recalculate_total();

AyeCode / invoicing

Push — master ( c71c5c...a8c7c0 )

Status

Category

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +456 added lines, -456 removed lines patch added patch discarded remove patch

Spacing +162 added lines, -162 removed lines patch added patch discarded remove patch

Indentation +175 added lines, -175 removed lines patch added patch discarded remove patch

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch