AyeCode / invoicing

includes/admin/class-getpaid-installer.php

Indentation +367 added lines, -367 removed lines

@@ -20,226 +20,226 @@ 
  */
 class GetPaid_Installer {
 
-	/**
-	 * Upgrades the install.
-	 *
-	 * @param string $upgrade_from The current invoicing version.
-	 */
-	public function upgrade_db( $upgrade_from ) {
-
-		// Save the current invoicing version.
-		update_option( 'wpinv_version', WPINV_VERSION );
-
-		// Setup the invoice Custom Post Type.
-		GetPaid_Post_Types::register_post_types();
-
-		// Clear the permalinks
-		flush_rewrite_rules();
-
-		// Maybe create new/missing pages.
-		$this->create_pages();
-
-		// Maybe re(add) admin capabilities.
-		$this->add_capabilities();
-
-		// Maybe create the default payment form.
-		wpinv_get_default_payment_form();
-
-		// Create any missing database tables.
-		$method = "upgrade_from_$upgrade_from";
-
-		$installed = get_option( 'gepaid_installed_on' );
-
-		if ( empty( $installed ) ) {
-			update_option( 'gepaid_installed_on', time() );
-		}
-
-		if ( method_exists( $this, $method ) ) {
-			$this->$method();
-		}
-
-	}
-
-	/**
-	 * Do a fresh install.
-	 *
-	 */
-	public function upgrade_from_0() {
-		$this->create_subscriptions_table();
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-
-		// Save default tax rates.
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-	}
-
-	/**
-	 * Upgrade to 0.0.5
-	 *
-	 */
-	public function upgrade_from_004() {
-		global $wpdb;
-
-		// Invoices.
-		$results = $wpdb->get_results( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-		if ( ! empty( $results ) ) {
-			$wpdb->query( "UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-
-			// Clean post cache
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->ID );
-			}
+    /**
+     * Upgrades the install.
+     *
+     * @param string $upgrade_from The current invoicing version.
+     */
+    public function upgrade_db( $upgrade_from ) {
+
+        // Save the current invoicing version.
+        update_option( 'wpinv_version', WPINV_VERSION );
+
+        // Setup the invoice Custom Post Type.
+        GetPaid_Post_Types::register_post_types();
+
+        // Clear the permalinks
+        flush_rewrite_rules();
+
+        // Maybe create new/missing pages.
+        $this->create_pages();
+
+        // Maybe re(add) admin capabilities.
+        $this->add_capabilities();
+
+        // Maybe create the default payment form.
+        wpinv_get_default_payment_form();
+
+        // Create any missing database tables.
+        $method = "upgrade_from_$upgrade_from";
+
+        $installed = get_option( 'gepaid_installed_on' );
+
+        if ( empty( $installed ) ) {
+            update_option( 'gepaid_installed_on', time() );
+        }
+
+        if ( method_exists( $this, $method ) ) {
+            $this->$method();
+        }
+
+    }
+
+    /**
+     * Do a fresh install.
+     *
+     */
+    public function upgrade_from_0() {
+        $this->create_subscriptions_table();
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+
+        // Save default tax rates.
+        update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+    }
+
+    /**
+     * Upgrade to 0.0.5
+     *
+     */
+    public function upgrade_from_004() {
+        global $wpdb;
+
+        // Invoices.
+        $results = $wpdb->get_results( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+        if ( ! empty( $results ) ) {
+            $wpdb->query( "UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+
+            // Clean post cache
+            foreach ( $results as $row ) {
+                clean_post_cache( $row->ID );
+            }
 }
 
-		// Item meta key changes
-		$query = 'SELECT DISTINCT post_id FROM ' . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-		$results = $wpdb->get_results( $query );
+        // Item meta key changes
+        $query = 'SELECT DISTINCT post_id FROM ' . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
+        $results = $wpdb->get_results( $query );
 
-		if ( ! empty( $results ) ) {
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+        if ( ! empty( $results ) ) {
+            $wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
+            $wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
+            $wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
 
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->post_id );
-			}
+            foreach ( $results as $row ) {
+                clean_post_cache( $row->post_id );
+            }
 }
 
-		$this->upgrade_from_102();
-	}
-
-	/**
-	 * Upgrade to 1.0.3
-	 *
-	 */
-	public function upgrade_from_102() {
-		$this->create_subscriptions_table();
-		$this->upgrade_from_118();
-	}
-
-	/**
-	 * Upgrade to version 2.0.0.
-	 *
-	 */
-	public function upgrade_from_118() {
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-		$this->migrate_old_invoices();
-	}
-
-	/**
-	 * Upgrade to version 2.0.8.
-	 *
-	 */
-	public function upgrade_from_207() {
-		global $wpdb;
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
-	}
-
-	/**
-	 * Give administrators the capability to manage GetPaid.
-	 *
-	 */
-	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
-	}
-
-	/**
-	 * Retreives GetPaid pages.
-	 *
-	 */
-	public static function get_pages() {
-
-		return apply_filters(
-			'wpinv_create_pages',
-			array(
-
-				// Checkout page.
-				'checkout_page'             => array(
-					'name'    => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Checkout', 'Page title', 'invoicing' ),
-					'content' => '
+        $this->upgrade_from_102();
+    }
+
+    /**
+     * Upgrade to 1.0.3
+     *
+     */
+    public function upgrade_from_102() {
+        $this->create_subscriptions_table();
+        $this->upgrade_from_118();
+    }
+
+    /**
+     * Upgrade to version 2.0.0.
+     *
+     */
+    public function upgrade_from_118() {
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+        $this->migrate_old_invoices();
+    }
+
+    /**
+     * Upgrade to version 2.0.8.
+     *
+     */
+    public function upgrade_from_207() {
+        global $wpdb;
+        $wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
+    }
+
+    /**
+     * Give administrators the capability to manage GetPaid.
+     *
+     */
+    public function add_capabilities() {
+        $GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+    }
+
+    /**
+     * Retreives GetPaid pages.
+     *
+     */
+    public static function get_pages() {
+
+        return apply_filters(
+            'wpinv_create_pages',
+            array(
+
+                // Checkout page.
+                'checkout_page'             => array(
+                    'name'    => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Checkout', 'Page title', 'invoicing' ),
+                    'content' => '
 						<!-- wp:shortcode -->
 						[wpinv_checkout]
 						<!-- /wp:shortcode -->
 					',
-					'parent'  => '',
-				),
-
-				// Invoice history page.
-				'invoice_history_page'      => array(
-					'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'  => '',
+                ),
+
+                // Invoice history page.
+                'invoice_history_page'      => array(
+                    'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_history]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => '',
-				),
-
-				// Success page content.
-				'success_page'              => array(
-					'name'    => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'  => '',
+                ),
+
+                // Success page content.
+                'success_page'              => array(
+                    'name'    => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_receipt]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => 'gp-checkout',
-				),
-
-				// Failure page content.
-				'failure_page'              => array(
-					'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
-					'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
-					'parent'  => 'gp-checkout',
-				),
-
-				// Subscriptions history page.
-				'invoice_subscription_page' => array(
-					'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'  => 'gp-checkout',
+                ),
+
+                // Failure page content.
+                'failure_page'              => array(
+                    'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
+                    'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
+                    'parent'  => 'gp-checkout',
+                ),
+
+                // Subscriptions history page.
+                'invoice_subscription_page' => array(
+                    'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_subscriptions]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => '',
-				),
+                    'parent'  => '',
+                ),
 
-			)
-		);
+            )
+        );
 
-	}
+    }
 
-	/**
-	 * Re-create GetPaid pages.
-	 *
-	 */
-	public function create_pages() {
+    /**
+     * Re-create GetPaid pages.
+     *
+     */
+    public function create_pages() {
 
-		foreach ( self::get_pages() as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
-		}
+        foreach ( self::get_pages() as $key => $page ) {
+            wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+        }
 
-	}
+    }
 
-	/**
-	 * Create subscriptions table.
-	 *
-	 */
-	public function create_subscriptions_table() {
+    /**
+     * Create subscriptions table.
+     *
+     */
+    public function create_subscriptions_table() {
 
-		global $wpdb;
+        global $wpdb;
 
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpinv_subscriptions (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpinv_subscriptions (
 			id bigint(20) unsigned NOT NULL auto_increment,
 			customer_id bigint(20) NOT NULL,
 			frequency int(11) NOT NULL DEFAULT '1',
@@ -262,22 +262,22 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoices table.
-	 *
-	 */
-	public function create_invoices_table() {
-		global $wpdb;
+    /**
+     * Create invoices table.
+     *
+     */
+    public function create_invoices_table() {
+        global $wpdb;
 
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
 			post_id BIGINT(20) NOT NULL,
             `number` VARCHAR(100),
             `key` VARCHAR(100),
@@ -313,22 +313,22 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoice items table.
-	 *
-	 */
-	public function create_invoice_items_table() {
-		global $wpdb;
+    /**
+     * Create invoice items table.
+     *
+     */
+    public function create_invoice_items_table() {
+        global $wpdb;
 
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
 			ID BIGINT(20) NOT NULL AUTO_INCREMENT,
             post_id BIGINT(20) NOT NULL,
             item_id BIGINT(20) NOT NULL,
@@ -350,159 +350,159 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public function migrate_old_invoices() {
-		global $wpdb;
-
-		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
-		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-		$migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
-		$invoices            = array_unique(
-			get_posts(
-				array(
-					'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
-					'posts_per_page' => -1,
-					'fields'         => 'ids',
-					'post_status'    => array_keys( get_post_stati() ),
-					'exclude'        => (array) $migrated,
-				)
-			)
-		);
-
-		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
-			return;
-		}
-
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php';
-
-		$invoice_rows = array();
-		foreach ( $invoices as $invoice ) {
-
-			$invoice = new WPInv_Legacy_Invoice( $invoice );
-
-			if ( empty( $invoice->ID ) ) {
-				return;
-			}
-
-			$fields = array(
-				'post_id'            => $invoice->ID,
-				'number'             => $invoice->get_number(),
-				'key'                => $invoice->get_key(),
-				'type'               => str_replace( 'wpi_', '', $invoice->post_type ),
-				'mode'               => $invoice->mode,
-				'user_ip'            => $invoice->get_ip(),
-				'first_name'         => $invoice->get_first_name(),
-				'last_name'          => $invoice->get_last_name(),
-				'address'            => $invoice->get_address(),
-				'city'               => $invoice->city,
-				'state'              => $invoice->state,
-				'country'            => $invoice->country,
-				'zip'                => $invoice->zip,
-				'adddress_confirmed' => (int) $invoice->adddress_confirmed,
-				'gateway'            => $invoice->get_gateway(),
-				'transaction_id'     => $invoice->get_transaction_id(),
-				'currency'           => $invoice->get_currency(),
-				'subtotal'           => $invoice->get_subtotal(),
-				'tax'                => $invoice->get_tax(),
-				'fees_total'         => $invoice->get_fees_total(),
-				'total'              => $invoice->get_total(),
-				'discount'           => $invoice->get_discount(),
-				'discount_code'      => $invoice->get_discount_code(),
-				'disable_taxes'      => $invoice->disable_taxes,
-				'due_date'           => $invoice->get_due_date(),
-				'completed_date'     => $invoice->get_completed_date(),
-				'company'            => $invoice->company,
-				'vat_number'         => $invoice->vat_number,
-				'vat_rate'           => $invoice->vat_rate,
-				'custom_meta'        => $invoice->payment_meta,
-			);
-
-			foreach ( $fields as $key => $val ) {
-				if ( is_null( $val ) ) {
-					$val = '';
-				}
-				$val = maybe_serialize( $val );
-				$fields[ $key ] = $wpdb->prepare( '%s', $val );
-			}
-
-			$fields = implode( ', ', $fields );
-			$invoice_rows[] = "($fields)";
-
-			$item_rows    = array();
-			$item_columns = array();
-			foreach ( $invoice->get_cart_details() as $details ) {
-				$fields = array(
-					'post_id'          => $invoice->ID,
-					'item_id'          => $details['id'],
-					'item_name'        => $details['name'],
-					'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
-					'vat_rate'         => $details['vat_rate'],
-					'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
-					'tax'              => $details['tax'],
-					'item_price'       => $details['item_price'],
-					'custom_price'     => $details['custom_price'],
-					'quantity'         => $details['quantity'],
-					'discount'         => $details['discount'],
-					'subtotal'         => $details['subtotal'],
-					'price'            => $details['price'],
-					'meta'             => $details['meta'],
-					'fees'             => $details['fees'],
-				);
-
-				$item_columns = array_keys( $fields );
-
-				foreach ( $fields as $key => $val ) {
-					if ( is_null( $val ) ) {
-						$val = '';
-					}
-					$val = maybe_serialize( $val );
-					$fields[ $key ] = $wpdb->prepare( '%s', $val );
-				}
-
-				$fields = implode( ', ', $fields );
-				$item_rows[] = "($fields)";
-			}
-
-			$item_rows    = implode( ', ', $item_rows );
-			$item_columns = implode( ', ', $item_columns );
-			$wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
-		}
-
-		if ( empty( $invoice_rows ) ) {
-			return;
-		}
-
-		$invoice_rows = implode( ', ', $invoice_rows );
-		$wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public static function rename_gateways_label() {
-		global $wpdb;
-
-		foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
-
-			$wpdb->update(
-				$wpdb->prefix . 'getpaid_invoices',
-				array( 'gateway' => $gateway ),
-				array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
-				'%s',
-				'%s'
-			);
-
-		}
-	}
+        dbDelta( $sql );
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public function migrate_old_invoices() {
+        global $wpdb;
+
+        $invoices_table      = $wpdb->prefix . 'getpaid_invoices';
+        $invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
+        $migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
+        $invoices            = array_unique(
+            get_posts(
+                array(
+                    'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+                    'posts_per_page' => -1,
+                    'fields'         => 'ids',
+                    'post_status'    => array_keys( get_post_stati() ),
+                    'exclude'        => (array) $migrated,
+                )
+            )
+        );
+
+        // Abort if we do not have any invoices.
+        if ( empty( $invoices ) ) {
+            return;
+        }
+
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php';
+
+        $invoice_rows = array();
+        foreach ( $invoices as $invoice ) {
+
+            $invoice = new WPInv_Legacy_Invoice( $invoice );
+
+            if ( empty( $invoice->ID ) ) {
+                return;
+            }
+
+            $fields = array(
+                'post_id'            => $invoice->ID,
+                'number'             => $invoice->get_number(),
+                'key'                => $invoice->get_key(),
+                'type'               => str_replace( 'wpi_', '', $invoice->post_type ),
+                'mode'               => $invoice->mode,
+                'user_ip'            => $invoice->get_ip(),
+                'first_name'         => $invoice->get_first_name(),
+                'last_name'          => $invoice->get_last_name(),
+                'address'            => $invoice->get_address(),
+                'city'               => $invoice->city,
+                'state'              => $invoice->state,
+                'country'            => $invoice->country,
+                'zip'                => $invoice->zip,
+                'adddress_confirmed' => (int) $invoice->adddress_confirmed,
+                'gateway'            => $invoice->get_gateway(),
+                'transaction_id'     => $invoice->get_transaction_id(),
+                'currency'           => $invoice->get_currency(),
+                'subtotal'           => $invoice->get_subtotal(),
+                'tax'                => $invoice->get_tax(),
+                'fees_total'         => $invoice->get_fees_total(),
+                'total'              => $invoice->get_total(),
+                'discount'           => $invoice->get_discount(),
+                'discount_code'      => $invoice->get_discount_code(),
+                'disable_taxes'      => $invoice->disable_taxes,
+                'due_date'           => $invoice->get_due_date(),
+                'completed_date'     => $invoice->get_completed_date(),
+                'company'            => $invoice->company,
+                'vat_number'         => $invoice->vat_number,
+                'vat_rate'           => $invoice->vat_rate,
+                'custom_meta'        => $invoice->payment_meta,
+            );
+
+            foreach ( $fields as $key => $val ) {
+                if ( is_null( $val ) ) {
+                    $val = '';
+                }
+                $val = maybe_serialize( $val );
+                $fields[ $key ] = $wpdb->prepare( '%s', $val );
+            }
+
+            $fields = implode( ', ', $fields );
+            $invoice_rows[] = "($fields)";
+
+            $item_rows    = array();
+            $item_columns = array();
+            foreach ( $invoice->get_cart_details() as $details ) {
+                $fields = array(
+                    'post_id'          => $invoice->ID,
+                    'item_id'          => $details['id'],
+                    'item_name'        => $details['name'],
+                    'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+                    'vat_rate'         => $details['vat_rate'],
+                    'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+                    'tax'              => $details['tax'],
+                    'item_price'       => $details['item_price'],
+                    'custom_price'     => $details['custom_price'],
+                    'quantity'         => $details['quantity'],
+                    'discount'         => $details['discount'],
+                    'subtotal'         => $details['subtotal'],
+                    'price'            => $details['price'],
+                    'meta'             => $details['meta'],
+                    'fees'             => $details['fees'],
+                );
+
+                $item_columns = array_keys( $fields );
+
+                foreach ( $fields as $key => $val ) {
+                    if ( is_null( $val ) ) {
+                        $val = '';
+                    }
+                    $val = maybe_serialize( $val );
+                    $fields[ $key ] = $wpdb->prepare( '%s', $val );
+                }
+
+                $fields = implode( ', ', $fields );
+                $item_rows[] = "($fields)";
+            }
+
+            $item_rows    = implode( ', ', $item_rows );
+            $item_columns = implode( ', ', $item_columns );
+            $wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
+        }
+
+        if ( empty( $invoice_rows ) ) {
+            return;
+        }
+
+        $invoice_rows = implode( ', ', $invoice_rows );
+        $wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public static function rename_gateways_label() {
+        global $wpdb;
+
+        foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
+
+            $wpdb->update(
+                $wpdb->prefix . 'getpaid_invoices',
+                array( 'gateway' => $gateway ),
+                array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
+                '%s',
+                '%s'
+            );
+
+        }
+    }
 
 }

Spacing +69 added lines, -69 removed lines

@@ -8,7 +8,7 @@ 
  * @since   2.0.2
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main installer/updater class.
@@ -25,10 +25,10 @@ 
 	 *
 	 * @param string $upgrade_from The current invoicing version.
 	 */
-	public function upgrade_db( $upgrade_from ) {
+	public function upgrade_db($upgrade_from) {
 
 		// Save the current invoicing version.
-		update_option( 'wpinv_version', WPINV_VERSION );
+		update_option('wpinv_version', WPINV_VERSION);
 
 		// Setup the invoice Custom Post Type.
 		GetPaid_Post_Types::register_post_types();
@@ -48,13 +48,13 @@ 
 		// Create any missing database tables.
 		$method = "upgrade_from_$upgrade_from";
 
-		$installed = get_option( 'gepaid_installed_on' );
+		$installed = get_option('gepaid_installed_on');
 
-		if ( empty( $installed ) ) {
-			update_option( 'gepaid_installed_on', time() );
+		if (empty($installed)) {
+			update_option('gepaid_installed_on', time());
 		}
 
-		if ( method_exists( $this, $method ) ) {
+		if (method_exists($this, $method)) {
 			$this->$method();
 		}
 
@@ -70,7 +70,7 @@ 
 		$this->create_invoice_items_table();
 
 		// Save default tax rates.
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+		update_option('wpinv_tax_rates', wpinv_get_data('tax-rates'));
 	}
 
 	/**
@@ -81,27 +81,27 @@ 
 		global $wpdb;
 
 		// Invoices.
-		$results = $wpdb->get_results( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-		if ( ! empty( $results ) ) {
-			$wpdb->query( "UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+		$results = $wpdb->get_results("SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
+		if (!empty($results)) {
+			$wpdb->query("UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
 
 			// Clean post cache
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->ID );
+			foreach ($results as $row) {
+				clean_post_cache($row->ID);
 			}
 }
 
 		// Item meta key changes
 		$query = 'SELECT DISTINCT post_id FROM ' . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-		$results = $wpdb->get_results( $query );
+		$results = $wpdb->get_results($query);
 
-		if ( ! empty( $results ) ) {
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-			$wpdb->query( 'UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+		if (!empty($results)) {
+			$wpdb->query('UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+			$wpdb->query('UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+			$wpdb->query('UPDATE ' . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
 
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->post_id );
+			foreach ($results as $row) {
+				clean_post_cache($row->post_id);
 			}
 }
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function upgrade_from_207() {
 		global $wpdb;
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
+		$wpdb->query("ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);");
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 *
 	 */
 	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+		$GLOBALS['wp_roles']->add_cap('administrator', 'manage_invoicing');
 	}
 
 	/**
@@ -156,8 +156,8 @@ 
 
 				// Checkout page.
 				'checkout_page'             => array(
-					'name'    => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Checkout', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-checkout', 'Page slug', 'invoicing'),
+					'title'   => _x('Checkout', 'Page title', 'invoicing'),
 					'content' => '
 						<!-- wp:shortcode -->
 						[wpinv_checkout]
@@ -168,8 +168,8 @@ 
 
 				// Invoice history page.
 				'invoice_history_page'      => array(
-					'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-invoices', 'Page slug', 'invoicing'),
+					'title'   => _x('My Invoices', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_history]
@@ -180,8 +180,8 @@ 
 
 				// Success page content.
 				'success_page'              => array(
-					'name'    => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-receipt', 'Page slug', 'invoicing'),
+					'title'   => _x('Payment Confirmation', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_receipt]
@@ -192,16 +192,16 @@ 
 
 				// Failure page content.
 				'failure_page'              => array(
-					'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
-					'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
+					'name'    => _x('gp-transaction-failed', 'Page slug', 'invoicing'),
+					'title'   => _x('Transaction Failed', 'Page title', 'invoicing'),
+					'content' => __('Your transaction failed, please try again or contact site support.', 'invoicing'),
 					'parent'  => 'gp-checkout',
 				),
 
 				// Subscriptions history page.
 				'invoice_subscription_page' => array(
-					'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-subscriptions', 'Page slug', 'invoicing'),
+					'title'   => _x('My Subscriptions', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_subscriptions]
@@ -221,8 +221,8 @@ 
 	 */
 	public function create_pages() {
 
-		foreach ( self::get_pages() as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+		foreach (self::get_pages() as $key => $page) {
+			wpinv_create_page(esc_sql($page['name']), $key, $page['title'], $page['content'], $page['parent']);
 		}
 
 	}
@@ -262,7 +262,7 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -313,7 +313,7 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -350,7 +350,7 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -363,32 +363,32 @@ 
 
 		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
 		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-		$migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
+		$migrated            = $wpdb->get_col("SELECT post_id FROM $invoices_table");
 		$invoices            = array_unique(
 			get_posts(
 				array(
-					'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+					'post_type'      => array('wpi_invoice', 'wpi_quote'),
 					'posts_per_page' => -1,
 					'fields'         => 'ids',
-					'post_status'    => array_keys( get_post_stati() ),
+					'post_status'    => array_keys(get_post_stati()),
 					'exclude'        => (array) $migrated,
 				)
 			)
 		);
 
 		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
+		if (empty($invoices)) {
 			return;
 		}
 
 		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php';
 
 		$invoice_rows = array();
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
-			$invoice = new WPInv_Legacy_Invoice( $invoice );
+			$invoice = new WPInv_Legacy_Invoice($invoice);
 
-			if ( empty( $invoice->ID ) ) {
+			if (empty($invoice->ID)) {
 				return;
 			}
 
@@ -396,7 +396,7 @@ 
 				'post_id'            => $invoice->ID,
 				'number'             => $invoice->get_number(),
 				'key'                => $invoice->get_key(),
-				'type'               => str_replace( 'wpi_', '', $invoice->post_type ),
+				'type'               => str_replace('wpi_', '', $invoice->post_type),
 				'mode'               => $invoice->mode,
 				'user_ip'            => $invoice->get_ip(),
 				'first_name'         => $invoice->get_first_name(),
@@ -425,27 +425,27 @@ 
 				'custom_meta'        => $invoice->payment_meta,
 			);
 
-			foreach ( $fields as $key => $val ) {
-				if ( is_null( $val ) ) {
+			foreach ($fields as $key => $val) {
+				if (is_null($val)) {
 					$val = '';
 				}
-				$val = maybe_serialize( $val );
-				$fields[ $key ] = $wpdb->prepare( '%s', $val );
+				$val = maybe_serialize($val);
+				$fields[$key] = $wpdb->prepare('%s', $val);
 			}
 
-			$fields = implode( ', ', $fields );
+			$fields = implode(', ', $fields);
 			$invoice_rows[] = "($fields)";
 
 			$item_rows    = array();
 			$item_columns = array();
-			foreach ( $invoice->get_cart_details() as $details ) {
+			foreach ($invoice->get_cart_details() as $details) {
 				$fields = array(
 					'post_id'          => $invoice->ID,
 					'item_id'          => $details['id'],
 					'item_name'        => $details['name'],
-					'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+					'item_description' => empty($details['meta']['description']) ? '' : $details['meta']['description'],
 					'vat_rate'         => $details['vat_rate'],
-					'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+					'vat_class'        => empty($details['vat_class']) ? '_standard' : $details['vat_class'],
 					'tax'              => $details['tax'],
 					'item_price'       => $details['item_price'],
 					'custom_price'     => $details['custom_price'],
@@ -457,31 +457,31 @@ 
 					'fees'             => $details['fees'],
 				);
 
-				$item_columns = array_keys( $fields );
+				$item_columns = array_keys($fields);
 
-				foreach ( $fields as $key => $val ) {
-					if ( is_null( $val ) ) {
+				foreach ($fields as $key => $val) {
+					if (is_null($val)) {
 						$val = '';
 					}
-					$val = maybe_serialize( $val );
-					$fields[ $key ] = $wpdb->prepare( '%s', $val );
+					$val = maybe_serialize($val);
+					$fields[$key] = $wpdb->prepare('%s', $val);
 				}
 
-				$fields = implode( ', ', $fields );
+				$fields = implode(', ', $fields);
 				$item_rows[] = "($fields)";
 			}
 
-			$item_rows    = implode( ', ', $item_rows );
-			$item_columns = implode( ', ', $item_columns );
-			$wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
+			$item_rows    = implode(', ', $item_rows);
+			$item_columns = implode(', ', $item_columns);
+			$wpdb->query("INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows");
 		}
 
-		if ( empty( $invoice_rows ) ) {
+		if (empty($invoice_rows)) {
 			return;
 		}
 
-		$invoice_rows = implode( ', ', $invoice_rows );
-		$wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+		$invoice_rows = implode(', ', $invoice_rows);
+		$wpdb->query("INSERT INTO $invoices_table VALUES $invoice_rows");
 
 	}
 
@@ -492,12 +492,12 @@ 
 	public static function rename_gateways_label() {
 		global $wpdb;
 
-		foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
+		foreach (array_keys(wpinv_get_payment_gateways()) as $gateway) {
 
 			$wpdb->update(
 				$wpdb->prefix . 'getpaid_invoices',
-				array( 'gateway' => $gateway ),
-				array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
+				array('gateway' => $gateway),
+				array('gateway' => wpinv_get_gateway_admin_label($gateway)),
 				'%s',
 				'%s'
 			);

includes/admin/class-wpinv-subscriptions-list-table.php

Indentation +463 added lines, -463 removed lines

@@ -8,7 +8,7 @@ 
 }
 
 if ( ! class_exists( 'WP_List_Table' ) ) {
-	include_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    include_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -16,468 +16,468 @@ 
  */
 class WPInv_Subscriptions_List_Table extends WP_List_Table {
 
-	/**
-	 * URL of this page
-	 *
-	 * @var   string
-	 * @since 1.0.19
-	 */
-	public $base_url;
-
-	/**
-	 * Query
-	 *
-	 * @var   GetPaid_Subscriptions_Query
-	 * @since 1.0.19
-	 */
-	public $query;
-
-	/**
-	 * Total subscriptions
-	 *
-	 * @var   string
-	 * @since 1.0.0
-	 */
-	public $total_count;
-
-	/**
-	 * Current status subscriptions
-	 *
-	 * @var   string
-	 * @since 1.0.0
-	 */
-	public $current_total_count;
-
-	/**
-	 * Status counts
-	 *
-	 * @var   array
-	 * @since 1.0.19
-	 */
-	public $status_counts;
-
-	/**
-	 * Number of results to show per page
-	 *
-	 * @var   int
-	 * @since 1.0.0
-	 */
-	public $per_page = 10;
-
-	/**
-	 *  Constructor function.
-	 */
-	public function __construct() {
-
-		parent::__construct(
-			array(
-				'singular' => 'subscription',
-				'plural'   => 'subscriptions',
-			)
-		);
-
-		$this->process_bulk_action();
-
-		$this->prepare_query();
-
-		$this->base_url = remove_query_arg( 'status' );
-
-	}
-
-	/**
-	 *  Prepares the display query
-	 */
-	public function prepare_query() {
-
-		// Prepare query args.
-		$query = array(
-			'number'      => $this->per_page,
-			'paged'       => $this->get_paged(),
-			'status'      => ( isset( $_GET['status'] ) && array_key_exists( $_GET['status'], getpaid_get_subscription_statuses() ) ) ? sanitize_text_field( $_GET['status'] ) : 'all',
-			'orderby'     => ( isset( $_GET['orderby'] ) ) ? sanitize_text_field( $_GET['orderby'] ) : 'id',
-			'order'       => ( isset( $_GET['order'] ) ) ? sanitize_text_field( $_GET['order'] ) : 'DESC',
-			'customer_in' => $this->get_user_in(),
-		);
-
-		if ( is_array( $query['customer_in'] ) && empty( $query['customer_in'] ) ) {
-			$this->total_count         = 0;
-			$this->current_total_count = 0;
-			$this->items               = array();
-			$this->status_counts       = array();
-			return;
-		}
-
-		// Prepare class properties.
-		$this->query               = new GetPaid_Subscriptions_Query( $query );
-		$this->total_count         = $this->query->get_total();
-		$this->current_total_count = $this->query->get_total();
-		$this->items               = $this->query->get_results();
-		$this->status_counts       = getpaid_get_subscription_status_counts( $query );
-
-		if ( 'all' != $query['status'] ) {
-			unset( $query['status'] );
-			$this->total_count   = getpaid_get_subscriptions( $query, 'count' );
-		}
-
-	}
-
-	/**
-	 * Get user in.
-	 *
-	 */
-	public function get_user_in() {
-
-		// Abort if no user.
-		if ( empty( $_GET['s'] ) ) {
-			return null;
-		}
-
-		// Or invalid user.
-		$user = wp_unslash( sanitize_text_field( $_REQUEST['s'] ) );
-
-		if ( empty( $user ) ) {
-			return null;
-		}
-
-		// Search matching users.
-		$user  = '*' . $user . '*';
-		$users = new WP_User_Query(
-			array(
-				'fields'      => 'ID',
-				'search'      => $user,
-				'count_total' => false,
-			)
-		);
-
-		return $users->get_results();
-	}
-
-	/**
-	 * Gets the list of views available on this table.
-	 *
-	 * The format is an associative array:
-	 * - `'id' => 'link'`
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return array
-	 */
-	public function get_views() {
-
-		$current  = isset( $_GET['status'] ) ? sanitize_text_field( $_GET['status'] ) : 'all';
-		$views    = array(
-
-			'all' => sprintf(
-				'<a href="%s" %s>%s&nbsp;<span class="count">(%d)</span></a>',
-				esc_url( add_query_arg( 'status', false, $this->base_url ) ),
-				$current === 'all' ? ' class="current"' : '',
-				__( 'All', 'invoicing' ),
-				$this->total_count
-			),
-
-		);
-
-		foreach ( array_filter( $this->status_counts ) as $status => $count ) {
-
-			$views[ $status ] = sprintf(
-				'<a href="%s" %s>%s&nbsp;<span class="count">(%d)</span></a>',
-				esc_url( add_query_arg( 'status', urlencode( $status ), $this->base_url ) ),
-				$current === $status ? ' class="current"' : '',
-				esc_html( getpaid_get_subscription_status_label( $status ) ),
-				$count
-			);
-
-		}
-
-		return $views;
-
-	}
-
-	/**
-	 * Render most columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function column_default( $item, $column_name ) {
-		return apply_filters( "getpaid_subscriptions_table_column_$column_name", $item->$column_name );
-	}
-
-	/**
-	 * This is how checkbox column renders.
-	 *
-	 * @param WPInv_Subscription $item
-	 * @return string
-	 */
-	public function column_cb( $item ) {
-		return sprintf( '<input type="checkbox" name="id[]" value="%s" />', esc_html( $item->get_id() ) );
-	}
-
-	/**
-	 * Status column
-	 *
-	 * @param WPInv_Subscription $item
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function column_status( $item ) {
-		return $item->get_status_label_html();
-	}
-
-	/**
-	 * Subscription column
-	 *
-	 * @param WPInv_Subscription $item
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function column_subscription( $item ) {
-
-		$username = __( '(Missing User)', 'invoicing' );
-
-		$user = get_userdata( $item->get_customer_id() );
-		if ( $user ) {
-
-			$username = sprintf(
-				'<a href="user-edit.php?user_id=%s">%s</a>',
-				absint( $user->ID ),
-				! empty( $user->display_name ) ? esc_html( $user->display_name ) : sanitize_email( $user->user_email )
-			);
-
-		}
-
-		// translators: $1: is opening link, $2: is subscription id number, $3: is closing link tag, $4: is user's name
-		$column_content = sprintf(
-			_x( '%1$s#%2$s%3$s for %4$s', 'Subscription title on admin table. (e.g.: #211 for John Doe)', 'invoicing' ),
-			'<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $item->get_id() ) ) ) . '">',
-			'<strong>' . esc_attr( $item->get_id() ) . '</strong>',
+    /**
+     * URL of this page
+     *
+     * @var   string
+     * @since 1.0.19
+     */
+    public $base_url;
+
+    /**
+     * Query
+     *
+     * @var   GetPaid_Subscriptions_Query
+     * @since 1.0.19
+     */
+    public $query;
+
+    /**
+     * Total subscriptions
+     *
+     * @var   string
+     * @since 1.0.0
+     */
+    public $total_count;
+
+    /**
+     * Current status subscriptions
+     *
+     * @var   string
+     * @since 1.0.0
+     */
+    public $current_total_count;
+
+    /**
+     * Status counts
+     *
+     * @var   array
+     * @since 1.0.19
+     */
+    public $status_counts;
+
+    /**
+     * Number of results to show per page
+     *
+     * @var   int
+     * @since 1.0.0
+     */
+    public $per_page = 10;
+
+    /**
+     *  Constructor function.
+     */
+    public function __construct() {
+
+        parent::__construct(
+            array(
+                'singular' => 'subscription',
+                'plural'   => 'subscriptions',
+            )
+        );
+
+        $this->process_bulk_action();
+
+        $this->prepare_query();
+
+        $this->base_url = remove_query_arg( 'status' );
+
+    }
+
+    /**
+     *  Prepares the display query
+     */
+    public function prepare_query() {
+
+        // Prepare query args.
+        $query = array(
+            'number'      => $this->per_page,
+            'paged'       => $this->get_paged(),
+            'status'      => ( isset( $_GET['status'] ) && array_key_exists( $_GET['status'], getpaid_get_subscription_statuses() ) ) ? sanitize_text_field( $_GET['status'] ) : 'all',
+            'orderby'     => ( isset( $_GET['orderby'] ) ) ? sanitize_text_field( $_GET['orderby'] ) : 'id',
+            'order'       => ( isset( $_GET['order'] ) ) ? sanitize_text_field( $_GET['order'] ) : 'DESC',
+            'customer_in' => $this->get_user_in(),
+        );
+
+        if ( is_array( $query['customer_in'] ) && empty( $query['customer_in'] ) ) {
+            $this->total_count         = 0;
+            $this->current_total_count = 0;
+            $this->items               = array();
+            $this->status_counts       = array();
+            return;
+        }
+
+        // Prepare class properties.
+        $this->query               = new GetPaid_Subscriptions_Query( $query );
+        $this->total_count         = $this->query->get_total();
+        $this->current_total_count = $this->query->get_total();
+        $this->items               = $this->query->get_results();
+        $this->status_counts       = getpaid_get_subscription_status_counts( $query );
+
+        if ( 'all' != $query['status'] ) {
+            unset( $query['status'] );
+            $this->total_count   = getpaid_get_subscriptions( $query, 'count' );
+        }
+
+    }
+
+    /**
+     * Get user in.
+     *
+     */
+    public function get_user_in() {
+
+        // Abort if no user.
+        if ( empty( $_GET['s'] ) ) {
+            return null;
+        }
+
+        // Or invalid user.
+        $user = wp_unslash( sanitize_text_field( $_REQUEST['s'] ) );
+
+        if ( empty( $user ) ) {
+            return null;
+        }
+
+        // Search matching users.
+        $user  = '*' . $user . '*';
+        $users = new WP_User_Query(
+            array(
+                'fields'      => 'ID',
+                'search'      => $user,
+                'count_total' => false,
+            )
+        );
+
+        return $users->get_results();
+    }
+
+    /**
+     * Gets the list of views available on this table.
+     *
+     * The format is an associative array:
+     * - `'id' => 'link'`
+     *
+     * @since 1.0.0
+     *
+     * @return array
+     */
+    public function get_views() {
+
+        $current  = isset( $_GET['status'] ) ? sanitize_text_field( $_GET['status'] ) : 'all';
+        $views    = array(
+
+            'all' => sprintf(
+                '<a href="%s" %s>%s&nbsp;<span class="count">(%d)</span></a>',
+                esc_url( add_query_arg( 'status', false, $this->base_url ) ),
+                $current === 'all' ? ' class="current"' : '',
+                __( 'All', 'invoicing' ),
+                $this->total_count
+            ),
+
+        );
+
+        foreach ( array_filter( $this->status_counts ) as $status => $count ) {
+
+            $views[ $status ] = sprintf(
+                '<a href="%s" %s>%s&nbsp;<span class="count">(%d)</span></a>',
+                esc_url( add_query_arg( 'status', urlencode( $status ), $this->base_url ) ),
+                $current === $status ? ' class="current"' : '',
+                esc_html( getpaid_get_subscription_status_label( $status ) ),
+                $count
+            );
+
+        }
+
+        return $views;
+
+    }
+
+    /**
+     * Render most columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    public function column_default( $item, $column_name ) {
+        return apply_filters( "getpaid_subscriptions_table_column_$column_name", $item->$column_name );
+    }
+
+    /**
+     * This is how checkbox column renders.
+     *
+     * @param WPInv_Subscription $item
+     * @return string
+     */
+    public function column_cb( $item ) {
+        return sprintf( '<input type="checkbox" name="id[]" value="%s" />', esc_html( $item->get_id() ) );
+    }
+
+    /**
+     * Status column
+     *
+     * @param WPInv_Subscription $item
+     * @since       1.0.0
+     * @return      string
+     */
+    public function column_status( $item ) {
+        return $item->get_status_label_html();
+    }
+
+    /**
+     * Subscription column
+     *
+     * @param WPInv_Subscription $item
+     * @since       1.0.0
+     * @return      string
+     */
+    public function column_subscription( $item ) {
+
+        $username = __( '(Missing User)', 'invoicing' );
+
+        $user = get_userdata( $item->get_customer_id() );
+        if ( $user ) {
+
+            $username = sprintf(
+                '<a href="user-edit.php?user_id=%s">%s</a>',
+                absint( $user->ID ),
+                ! empty( $user->display_name ) ? esc_html( $user->display_name ) : sanitize_email( $user->user_email )
+            );
+
+        }
+
+        // translators: $1: is opening link, $2: is subscription id number, $3: is closing link tag, $4: is user's name
+        $column_content = sprintf(
+            _x( '%1$s#%2$s%3$s for %4$s', 'Subscription title on admin table. (e.g.: #211 for John Doe)', 'invoicing' ),
+            '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $item->get_id() ) ) ) . '">',
+            '<strong>' . esc_attr( $item->get_id() ) . '</strong>',
             '</a>',
-			$username
-		);
-
-		$row_actions = array();
-
-		// View subscription.
-		$view_url    = esc_url( add_query_arg( 'id', $item->get_id(), admin_url( 'admin.php?page=wpinv-subscriptions' ) ) );
-		$row_actions['view'] = '<a href="' . $view_url . '">' . __( 'View Subscription', 'invoicing' ) . '</a>';
-
-		// View invoice.
-		$invoice = get_post( $item->get_parent_invoice_id() );
-
-		if ( ! empty( $invoice ) ) {
-			$invoice_url            = get_edit_post_link( $invoice );
-			$row_actions['invoice'] = '<a href="' . $invoice_url . '">' . __( 'View Invoice', 'invoicing' ) . '</a>';
-		}
-
-		$delete_url            = esc_url(
-			wp_nonce_url(
-				add_query_arg(
-					array(
-						'getpaid-admin-action' => 'subscription_manual_delete',
-						'id'                   => $item->get_id(),
-					)
-				),
-				'getpaid-nonce',
-				'getpaid-nonce'
-			)
-		);
-		$row_actions['delete'] = '<a class="text-danger" href="' . $delete_url . '">' . __( 'Delete Subscription', 'invoicing' ) . '</a>';
-
-		$row_actions = $this->row_actions( apply_filters( 'getpaid_subscription_table_row_actions', $row_actions, $item ) );
-
-		return "<strong>$column_content</strong>" . $this->column_amount( $item ) . $row_actions;
-	}
-
-	/**
-	 * Renewal date column
-	 *
-	 * @param WPInv_Subscription $item
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function column_renewal_date( $item ) {
-		return getpaid_format_date_value( $item->get_expiration() );
-	}
-
-	/**
-	 * Start date column
-	 *
-	 * @param WPInv_Subscription $item
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function column_start_date( $item ) {
-
-		$gateway = $item->get_parent_invoice()->get_gateway_title();
-
-		if ( empty( $gateway ) ) {
-			return getpaid_format_date_value( $item->get_date_created() );
-		}
-
-		$url = apply_filters( 'getpaid_remote_subscription_profile_url', '', $item );
-		if ( ! empty( $url ) ) {
-
-			return getpaid_format_date_value( $item->get_date_created() ) . '<br>' . sprintf(
-				__( 'Via %s', 'invoicing' ),
-				'<strong><a href="' . esc_url( $url ) . '" target="_blank">' . esc_html( $item->get_parent_invoice()->get_gateway_title() ) . '</a></strong>'
-			);
-
-		}
-
-		return getpaid_format_date_value( $item->get_date_created() ) . '<br>' . sprintf(
-			__( 'Via %s', 'invoicing' ),
-			'<strong>' . esc_html( $item->get_parent_invoice()->get_gateway_title() ) . '</strong>'
-		);
-
-	}
-
-	/**
-	 * Amount column
-	 *
-	 * @param WPInv_Subscription $item
-	 * @since       1.0.19
-	 * @return      string
-	 */
-	public static function column_amount( $item ) {
-		$amount = getpaid_get_formatted_subscription_amount( $item );
-		return "<span class='text-muted form-text mt-2 mb-2'>$amount</span>";
-	}
-
-	/**
-	 * Billing Times column
-	 *
-	 * @param WPInv_Subscription $item
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function column_renewals( $item ) {
-		$max_bills = $item->get_bill_times();
-		return $item->get_times_billed() . ' / ' . ( empty( $max_bills ) ? '&infin;' : $max_bills );
-	}
-
-	/**
-	 * Product ID column
-	 *
-	 * @param WPInv_Subscription $item
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function column_item( $item ) {
-		$subscription_group = getpaid_get_invoice_subscription_group( $item->get_parent_invoice_id(), $item->get_id() );
-
-		if ( empty( $subscription_group ) ) {
-			return $this->generate_item_markup( $item->get_product_id() );
-		}
-
-		$markup = array_map( array( $this, 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-		return implode( ' | ', $markup );
-
-	}
-
-	/**
-	 * Generates the items markup.
-	 *
-	 * @param int $item_id
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public static function generate_item_markup( $item_id ) {
-		$item = get_post( $item_id );
-
-		if ( ! empty( $item ) ) {
-			$link = get_edit_post_link( $item );
-			$link = esc_url( $link );
-			$name = esc_html( get_the_title( $item ) );
-			return wpinv_current_user_can_manage_invoicing() ? "<a href='$link'>$name</a>" : $name;
-		} else {
-			return sprintf( __( 'Item #%s', 'invoicing' ), $item_id );
-		}
-
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @return      int
-	 */
-	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 */
-	public function prepare_items() {
-
-		$columns  = $this->get_columns();
-		$hidden   = array();
-		$sortable = $this->get_sortable_columns();
-
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		$this->set_pagination_args(
-			array(
-				'total_items' => $this->current_total_count,
-				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->current_total_count / $this->per_page ),
-			)
-		);
-	}
-
-	/**
-	 * Table columns
-	 *
-	 * @return array
-	 */
-	public function get_columns() {
-		$columns = array(
-			'cb'           => '<input type="checkbox" />',
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'start_date'   => __( 'Start Date', 'invoicing' ),
-			'renewal_date' => __( 'Next Payment', 'invoicing' ),
-			'renewals'     => __( 'Payments', 'invoicing' ),
-			'item'         => __( 'Items', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-		);
-
-		return apply_filters( 'manage_getpaid_subscriptions_table_columns', $columns );
-	}
-
-	/**
-	 * Sortable table columns.
-	 *
-	 * @return array
-	 */
-	public function get_sortable_columns() {
-		$sortable = array(
-			'subscription' => array( 'id', true ),
-			'start_date'   => array( 'created', true ),
-			'renewal_date' => array( 'expiration', true ),
-			'renewals'     => array( 'bill_times', true ),
-			'item'         => array( 'product_id', true ),
-			'status'       => array( 'status', true ),
-		);
-
-		return apply_filters( 'manage_getpaid_subscriptions_sortable_table_columns', $sortable );
-	}
-
-	/**
-	 * Whether the table has items to display or not
-	 *
-	 * @return bool
-	 */
-	public function has_items() {
-		return ! empty( $this->current_total_count );
-	}
-
-	/**
-	 * Processes bulk actions.
-	 *
-	 */
-	public function process_bulk_action() {
-
-	}
+            $username
+        );
+
+        $row_actions = array();
+
+        // View subscription.
+        $view_url    = esc_url( add_query_arg( 'id', $item->get_id(), admin_url( 'admin.php?page=wpinv-subscriptions' ) ) );
+        $row_actions['view'] = '<a href="' . $view_url . '">' . __( 'View Subscription', 'invoicing' ) . '</a>';
+
+        // View invoice.
+        $invoice = get_post( $item->get_parent_invoice_id() );
+
+        if ( ! empty( $invoice ) ) {
+            $invoice_url            = get_edit_post_link( $invoice );
+            $row_actions['invoice'] = '<a href="' . $invoice_url . '">' . __( 'View Invoice', 'invoicing' ) . '</a>';
+        }
+
+        $delete_url            = esc_url(
+            wp_nonce_url(
+                add_query_arg(
+                    array(
+                        'getpaid-admin-action' => 'subscription_manual_delete',
+                        'id'                   => $item->get_id(),
+                    )
+                ),
+                'getpaid-nonce',
+                'getpaid-nonce'
+            )
+        );
+        $row_actions['delete'] = '<a class="text-danger" href="' . $delete_url . '">' . __( 'Delete Subscription', 'invoicing' ) . '</a>';
+
+        $row_actions = $this->row_actions( apply_filters( 'getpaid_subscription_table_row_actions', $row_actions, $item ) );
+
+        return "<strong>$column_content</strong>" . $this->column_amount( $item ) . $row_actions;
+    }
+
+    /**
+     * Renewal date column
+     *
+     * @param WPInv_Subscription $item
+     * @since       1.0.0
+     * @return      string
+     */
+    public function column_renewal_date( $item ) {
+        return getpaid_format_date_value( $item->get_expiration() );
+    }
+
+    /**
+     * Start date column
+     *
+     * @param WPInv_Subscription $item
+     * @since       1.0.0
+     * @return      string
+     */
+    public function column_start_date( $item ) {
+
+        $gateway = $item->get_parent_invoice()->get_gateway_title();
+
+        if ( empty( $gateway ) ) {
+            return getpaid_format_date_value( $item->get_date_created() );
+        }
+
+        $url = apply_filters( 'getpaid_remote_subscription_profile_url', '', $item );
+        if ( ! empty( $url ) ) {
+
+            return getpaid_format_date_value( $item->get_date_created() ) . '<br>' . sprintf(
+                __( 'Via %s', 'invoicing' ),
+                '<strong><a href="' . esc_url( $url ) . '" target="_blank">' . esc_html( $item->get_parent_invoice()->get_gateway_title() ) . '</a></strong>'
+            );
+
+        }
+
+        return getpaid_format_date_value( $item->get_date_created() ) . '<br>' . sprintf(
+            __( 'Via %s', 'invoicing' ),
+            '<strong>' . esc_html( $item->get_parent_invoice()->get_gateway_title() ) . '</strong>'
+        );
+
+    }
+
+    /**
+     * Amount column
+     *
+     * @param WPInv_Subscription $item
+     * @since       1.0.19
+     * @return      string
+     */
+    public static function column_amount( $item ) {
+        $amount = getpaid_get_formatted_subscription_amount( $item );
+        return "<span class='text-muted form-text mt-2 mb-2'>$amount</span>";
+    }
+
+    /**
+     * Billing Times column
+     *
+     * @param WPInv_Subscription $item
+     * @since       1.0.0
+     * @return      string
+     */
+    public function column_renewals( $item ) {
+        $max_bills = $item->get_bill_times();
+        return $item->get_times_billed() . ' / ' . ( empty( $max_bills ) ? '&infin;' : $max_bills );
+    }
+
+    /**
+     * Product ID column
+     *
+     * @param WPInv_Subscription $item
+     * @since       1.0.0
+     * @return      string
+     */
+    public function column_item( $item ) {
+        $subscription_group = getpaid_get_invoice_subscription_group( $item->get_parent_invoice_id(), $item->get_id() );
+
+        if ( empty( $subscription_group ) ) {
+            return $this->generate_item_markup( $item->get_product_id() );
+        }
+
+        $markup = array_map( array( $this, 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
+        return implode( ' | ', $markup );
+
+    }
+
+    /**
+     * Generates the items markup.
+     *
+     * @param int $item_id
+     * @since       1.0.0
+     * @return      string
+     */
+    public static function generate_item_markup( $item_id ) {
+        $item = get_post( $item_id );
+
+        if ( ! empty( $item ) ) {
+            $link = get_edit_post_link( $item );
+            $link = esc_url( $link );
+            $name = esc_html( get_the_title( $item ) );
+            return wpinv_current_user_can_manage_invoicing() ? "<a href='$link'>$name</a>" : $name;
+        } else {
+            return sprintf( __( 'Item #%s', 'invoicing' ), $item_id );
+        }
+
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @return      int
+     */
+    public function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     */
+    public function prepare_items() {
+
+        $columns  = $this->get_columns();
+        $hidden   = array();
+        $sortable = $this->get_sortable_columns();
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        $this->set_pagination_args(
+            array(
+                'total_items' => $this->current_total_count,
+                'per_page'    => $this->per_page,
+                'total_pages' => ceil( $this->current_total_count / $this->per_page ),
+            )
+        );
+    }
+
+    /**
+     * Table columns
+     *
+     * @return array
+     */
+    public function get_columns() {
+        $columns = array(
+            'cb'           => '<input type="checkbox" />',
+            'subscription' => __( 'Subscription', 'invoicing' ),
+            'start_date'   => __( 'Start Date', 'invoicing' ),
+            'renewal_date' => __( 'Next Payment', 'invoicing' ),
+            'renewals'     => __( 'Payments', 'invoicing' ),
+            'item'         => __( 'Items', 'invoicing' ),
+            'status'       => __( 'Status', 'invoicing' ),
+        );
+
+        return apply_filters( 'manage_getpaid_subscriptions_table_columns', $columns );
+    }
+
+    /**
+     * Sortable table columns.
+     *
+     * @return array
+     */
+    public function get_sortable_columns() {
+        $sortable = array(
+            'subscription' => array( 'id', true ),
+            'start_date'   => array( 'created', true ),
+            'renewal_date' => array( 'expiration', true ),
+            'renewals'     => array( 'bill_times', true ),
+            'item'         => array( 'product_id', true ),
+            'status'       => array( 'status', true ),
+        );
+
+        return apply_filters( 'manage_getpaid_subscriptions_sortable_table_columns', $sortable );
+    }
+
+    /**
+     * Whether the table has items to display or not
+     *
+     * @return bool
+     */
+    public function has_items() {
+        return ! empty( $this->current_total_count );
+    }
+
+    /**
+     * Processes bulk actions.
+     *
+     */
+    public function process_bulk_action() {
+
+    }
 
 }

Spacing +94 added lines, -94 removed lines

@@ -3,11 +3,11 @@ 
  * Displays a list of all subscriptions rules
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 exit;
 }
 
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	include_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -80,7 +80,7 @@ 
 
 		$this->prepare_query();
 
-		$this->base_url = remove_query_arg( 'status' );
+		$this->base_url = remove_query_arg('status');
 
 	}
 
@@ -93,13 +93,13 @@ 
 		$query = array(
 			'number'      => $this->per_page,
 			'paged'       => $this->get_paged(),
-			'status'      => ( isset( $_GET['status'] ) && array_key_exists( $_GET['status'], getpaid_get_subscription_statuses() ) ) ? sanitize_text_field( $_GET['status'] ) : 'all',
-			'orderby'     => ( isset( $_GET['orderby'] ) ) ? sanitize_text_field( $_GET['orderby'] ) : 'id',
-			'order'       => ( isset( $_GET['order'] ) ) ? sanitize_text_field( $_GET['order'] ) : 'DESC',
+			'status'      => (isset($_GET['status']) && array_key_exists($_GET['status'], getpaid_get_subscription_statuses())) ? sanitize_text_field($_GET['status']) : 'all',
+			'orderby'     => (isset($_GET['orderby'])) ? sanitize_text_field($_GET['orderby']) : 'id',
+			'order'       => (isset($_GET['order'])) ? sanitize_text_field($_GET['order']) : 'DESC',
 			'customer_in' => $this->get_user_in(),
 		);
 
-		if ( is_array( $query['customer_in'] ) && empty( $query['customer_in'] ) ) {
+		if (is_array($query['customer_in']) && empty($query['customer_in'])) {
 			$this->total_count         = 0;
 			$this->current_total_count = 0;
 			$this->items               = array();
@@ -108,15 +108,15 @@ 
 		}
 
 		// Prepare class properties.
-		$this->query               = new GetPaid_Subscriptions_Query( $query );
+		$this->query               = new GetPaid_Subscriptions_Query($query);
 		$this->total_count         = $this->query->get_total();
 		$this->current_total_count = $this->query->get_total();
 		$this->items               = $this->query->get_results();
-		$this->status_counts       = getpaid_get_subscription_status_counts( $query );
+		$this->status_counts       = getpaid_get_subscription_status_counts($query);
 
-		if ( 'all' != $query['status'] ) {
-			unset( $query['status'] );
-			$this->total_count   = getpaid_get_subscriptions( $query, 'count' );
+		if ('all' != $query['status']) {
+			unset($query['status']);
+			$this->total_count = getpaid_get_subscriptions($query, 'count');
 		}
 
 	}
@@ -128,14 +128,14 @@ 
 	public function get_user_in() {
 
 		// Abort if no user.
-		if ( empty( $_GET['s'] ) ) {
+		if (empty($_GET['s'])) {
 			return null;
 		}
 
 		// Or invalid user.
-		$user = wp_unslash( sanitize_text_field( $_REQUEST['s'] ) );
+		$user = wp_unslash(sanitize_text_field($_REQUEST['s']));
 
-		if ( empty( $user ) ) {
+		if (empty($user)) {
 			return null;
 		}
 
@@ -164,26 +164,26 @@ 
 	 */
 	public function get_views() {
 
-		$current  = isset( $_GET['status'] ) ? sanitize_text_field( $_GET['status'] ) : 'all';
+		$current  = isset($_GET['status']) ? sanitize_text_field($_GET['status']) : 'all';
 		$views    = array(
 
 			'all' => sprintf(
 				'<a href="%s" %s>%s&nbsp;<span class="count">(%d)</span></a>',
-				esc_url( add_query_arg( 'status', false, $this->base_url ) ),
+				esc_url(add_query_arg('status', false, $this->base_url)),
 				$current === 'all' ? ' class="current"' : '',
-				__( 'All', 'invoicing' ),
+				__('All', 'invoicing'),
 				$this->total_count
 			),
 
 		);
 
-		foreach ( array_filter( $this->status_counts ) as $status => $count ) {
+		foreach (array_filter($this->status_counts) as $status => $count) {
 
-			$views[ $status ] = sprintf(
+			$views[$status] = sprintf(
 				'<a href="%s" %s>%s&nbsp;<span class="count">(%d)</span></a>',
-				esc_url( add_query_arg( 'status', urlencode( $status ), $this->base_url ) ),
+				esc_url(add_query_arg('status', urlencode($status), $this->base_url)),
 				$current === $status ? ' class="current"' : '',
-				esc_html( getpaid_get_subscription_status_label( $status ) ),
+				esc_html(getpaid_get_subscription_status_label($status)),
 				$count
 			);
 
@@ -200,8 +200,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_default( $item, $column_name ) {
-		return apply_filters( "getpaid_subscriptions_table_column_$column_name", $item->$column_name );
+	public function column_default($item, $column_name) {
+		return apply_filters("getpaid_subscriptions_table_column_$column_name", $item->$column_name);
 	}
 
 	/**
@@ -210,8 +210,8 @@ 
 	 * @param WPInv_Subscription $item
 	 * @return string
 	 */
-	public function column_cb( $item ) {
-		return sprintf( '<input type="checkbox" name="id[]" value="%s" />', esc_html( $item->get_id() ) );
+	public function column_cb($item) {
+		return sprintf('<input type="checkbox" name="id[]" value="%s" />', esc_html($item->get_id()));
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_status( $item ) {
+	public function column_status($item) {
 		return $item->get_status_label_html();
 	}
 
@@ -232,26 +232,26 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_subscription( $item ) {
+	public function column_subscription($item) {
 
-		$username = __( '(Missing User)', 'invoicing' );
+		$username = __('(Missing User)', 'invoicing');
 
-		$user = get_userdata( $item->get_customer_id() );
-		if ( $user ) {
+		$user = get_userdata($item->get_customer_id());
+		if ($user) {
 
 			$username = sprintf(
 				'<a href="user-edit.php?user_id=%s">%s</a>',
-				absint( $user->ID ),
-				! empty( $user->display_name ) ? esc_html( $user->display_name ) : sanitize_email( $user->user_email )
+				absint($user->ID),
+				!empty($user->display_name) ? esc_html($user->display_name) : sanitize_email($user->user_email)
 			);
 
 		}
 
 		// translators: $1: is opening link, $2: is subscription id number, $3: is closing link tag, $4: is user's name
 		$column_content = sprintf(
-			_x( '%1$s#%2$s%3$s for %4$s', 'Subscription title on admin table. (e.g.: #211 for John Doe)', 'invoicing' ),
-			'<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $item->get_id() ) ) ) . '">',
-			'<strong>' . esc_attr( $item->get_id() ) . '</strong>',
+			_x('%1$s#%2$s%3$s for %4$s', 'Subscription title on admin table. (e.g.: #211 for John Doe)', 'invoicing'),
+			'<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . absint($item->get_id()))) . '">',
+			'<strong>' . esc_attr($item->get_id()) . '</strong>',
             '</a>',
 			$username
 		);
@@ -259,18 +259,18 @@ 
 		$row_actions = array();
 
 		// View subscription.
-		$view_url    = esc_url( add_query_arg( 'id', $item->get_id(), admin_url( 'admin.php?page=wpinv-subscriptions' ) ) );
-		$row_actions['view'] = '<a href="' . $view_url . '">' . __( 'View Subscription', 'invoicing' ) . '</a>';
+		$view_url    = esc_url(add_query_arg('id', $item->get_id(), admin_url('admin.php?page=wpinv-subscriptions')));
+		$row_actions['view'] = '<a href="' . $view_url . '">' . __('View Subscription', 'invoicing') . '</a>';
 
 		// View invoice.
-		$invoice = get_post( $item->get_parent_invoice_id() );
+		$invoice = get_post($item->get_parent_invoice_id());
 
-		if ( ! empty( $invoice ) ) {
-			$invoice_url            = get_edit_post_link( $invoice );
-			$row_actions['invoice'] = '<a href="' . $invoice_url . '">' . __( 'View Invoice', 'invoicing' ) . '</a>';
+		if (!empty($invoice)) {
+			$invoice_url            = get_edit_post_link($invoice);
+			$row_actions['invoice'] = '<a href="' . $invoice_url . '">' . __('View Invoice', 'invoicing') . '</a>';
 		}
 
-		$delete_url            = esc_url(
+		$delete_url = esc_url(
 			wp_nonce_url(
 				add_query_arg(
 					array(
@@ -282,11 +282,11 @@ 
 				'getpaid-nonce'
 			)
 		);
-		$row_actions['delete'] = '<a class="text-danger" href="' . $delete_url . '">' . __( 'Delete Subscription', 'invoicing' ) . '</a>';
+		$row_actions['delete'] = '<a class="text-danger" href="' . $delete_url . '">' . __('Delete Subscription', 'invoicing') . '</a>';
 
-		$row_actions = $this->row_actions( apply_filters( 'getpaid_subscription_table_row_actions', $row_actions, $item ) );
+		$row_actions = $this->row_actions(apply_filters('getpaid_subscription_table_row_actions', $row_actions, $item));
 
-		return "<strong>$column_content</strong>" . $this->column_amount( $item ) . $row_actions;
+		return "<strong>$column_content</strong>" . $this->column_amount($item) . $row_actions;
 	}
 
 	/**
@@ -296,8 +296,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_renewal_date( $item ) {
-		return getpaid_format_date_value( $item->get_expiration() );
+	public function column_renewal_date($item) {
+		return getpaid_format_date_value($item->get_expiration());
 	}
 
 	/**
@@ -307,27 +307,27 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_start_date( $item ) {
+	public function column_start_date($item) {
 
 		$gateway = $item->get_parent_invoice()->get_gateway_title();
 
-		if ( empty( $gateway ) ) {
-			return getpaid_format_date_value( $item->get_date_created() );
+		if (empty($gateway)) {
+			return getpaid_format_date_value($item->get_date_created());
 		}
 
-		$url = apply_filters( 'getpaid_remote_subscription_profile_url', '', $item );
-		if ( ! empty( $url ) ) {
+		$url = apply_filters('getpaid_remote_subscription_profile_url', '', $item);
+		if (!empty($url)) {
 
-			return getpaid_format_date_value( $item->get_date_created() ) . '<br>' . sprintf(
-				__( 'Via %s', 'invoicing' ),
-				'<strong><a href="' . esc_url( $url ) . '" target="_blank">' . esc_html( $item->get_parent_invoice()->get_gateway_title() ) . '</a></strong>'
+			return getpaid_format_date_value($item->get_date_created()) . '<br>' . sprintf(
+				__('Via %s', 'invoicing'),
+				'<strong><a href="' . esc_url($url) . '" target="_blank">' . esc_html($item->get_parent_invoice()->get_gateway_title()) . '</a></strong>'
 			);
 
 		}
 
-		return getpaid_format_date_value( $item->get_date_created() ) . '<br>' . sprintf(
-			__( 'Via %s', 'invoicing' ),
-			'<strong>' . esc_html( $item->get_parent_invoice()->get_gateway_title() ) . '</strong>'
+		return getpaid_format_date_value($item->get_date_created()) . '<br>' . sprintf(
+			__('Via %s', 'invoicing'),
+			'<strong>' . esc_html($item->get_parent_invoice()->get_gateway_title()) . '</strong>'
 		);
 
 	}
@@ -339,8 +339,8 @@ 
 	 * @since       1.0.19
 	 * @return      string
 	 */
-	public static function column_amount( $item ) {
-		$amount = getpaid_get_formatted_subscription_amount( $item );
+	public static function column_amount($item) {
+		$amount = getpaid_get_formatted_subscription_amount($item);
 		return "<span class='text-muted form-text mt-2 mb-2'>$amount</span>";
 	}
 
@@ -351,9 +351,9 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_renewals( $item ) {
+	public function column_renewals($item) {
 		$max_bills = $item->get_bill_times();
-		return $item->get_times_billed() . ' / ' . ( empty( $max_bills ) ? '&infin;' : $max_bills );
+		return $item->get_times_billed() . ' / ' . (empty($max_bills) ? '&infin;' : $max_bills);
 	}
 
 	/**
@@ -363,15 +363,15 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_item( $item ) {
-		$subscription_group = getpaid_get_invoice_subscription_group( $item->get_parent_invoice_id(), $item->get_id() );
+	public function column_item($item) {
+		$subscription_group = getpaid_get_invoice_subscription_group($item->get_parent_invoice_id(), $item->get_id());
 
-		if ( empty( $subscription_group ) ) {
-			return $this->generate_item_markup( $item->get_product_id() );
+		if (empty($subscription_group)) {
+			return $this->generate_item_markup($item->get_product_id());
 		}
 
-		$markup = array_map( array( $this, 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-		return implode( ' | ', $markup );
+		$markup = array_map(array($this, 'generate_item_markup'), array_keys($subscription_group['items']));
+		return implode(' | ', $markup);
 
 	}
 
@@ -382,16 +382,16 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public static function generate_item_markup( $item_id ) {
-		$item = get_post( $item_id );
+	public static function generate_item_markup($item_id) {
+		$item = get_post($item_id);
 
-		if ( ! empty( $item ) ) {
-			$link = get_edit_post_link( $item );
-			$link = esc_url( $link );
-			$name = esc_html( get_the_title( $item ) );
+		if (!empty($item)) {
+			$link = get_edit_post_link($item);
+			$link = esc_url($link);
+			$name = esc_html(get_the_title($item));
 			return wpinv_current_user_can_manage_invoicing() ? "<a href='$link'>$name</a>" : $name;
 		} else {
-			return sprintf( __( 'Item #%s', 'invoicing' ), $item_id );
+			return sprintf(__('Item #%s', 'invoicing'), $item_id);
 		}
 
 	}
@@ -402,7 +402,7 @@ 
 	 * @return      int
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -415,13 +415,13 @@ 
 		$hidden   = array();
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$this->set_pagination_args(
 			array(
 				'total_items' => $this->current_total_count,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->current_total_count / $this->per_page ),
+				'total_pages' => ceil($this->current_total_count / $this->per_page),
 			)
 		);
 	}
@@ -434,15 +434,15 @@ 
 	public function get_columns() {
 		$columns = array(
 			'cb'           => '<input type="checkbox" />',
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'start_date'   => __( 'Start Date', 'invoicing' ),
-			'renewal_date' => __( 'Next Payment', 'invoicing' ),
-			'renewals'     => __( 'Payments', 'invoicing' ),
-			'item'         => __( 'Items', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
+			'subscription' => __('Subscription', 'invoicing'),
+			'start_date'   => __('Start Date', 'invoicing'),
+			'renewal_date' => __('Next Payment', 'invoicing'),
+			'renewals'     => __('Payments', 'invoicing'),
+			'item'         => __('Items', 'invoicing'),
+			'status'       => __('Status', 'invoicing'),
 		);
 
-		return apply_filters( 'manage_getpaid_subscriptions_table_columns', $columns );
+		return apply_filters('manage_getpaid_subscriptions_table_columns', $columns);
 	}
 
 	/**
@@ -452,15 +452,15 @@ 
 	 */
 	public function get_sortable_columns() {
 		$sortable = array(
-			'subscription' => array( 'id', true ),
-			'start_date'   => array( 'created', true ),
-			'renewal_date' => array( 'expiration', true ),
-			'renewals'     => array( 'bill_times', true ),
-			'item'         => array( 'product_id', true ),
-			'status'       => array( 'status', true ),
+			'subscription' => array('id', true),
+			'start_date'   => array('created', true),
+			'renewal_date' => array('expiration', true),
+			'renewals'     => array('bill_times', true),
+			'item'         => array('product_id', true),
+			'status'       => array('status', true),
 		);
 
-		return apply_filters( 'manage_getpaid_subscriptions_sortable_table_columns', $sortable );
+		return apply_filters('manage_getpaid_subscriptions_sortable_table_columns', $sortable);
 	}
 
 	/**
@@ -469,7 +469,7 @@ 
 	 * @return bool
 	 */
 	public function has_items() {
-		return ! empty( $this->current_total_count );
+		return !empty($this->current_total_count);
 	}
 
 	/**

includes/admin/views/html-gateways-edit.php

Indentation +4 added lines, -4 removed lines

@@ -44,9 +44,9 @@ 
                         <?php
 
                             if ( wpinv_is_gateway_active( $id ) ) {
-							echo "<i class='text-success fa fa-check'></i>";
+                            echo "<i class='text-success fa fa-check'></i>";
                             } else {
-							echo "<i class='text-dark fa fa-times'></i>";
+                            echo "<i class='text-dark fa fa-times'></i>";
                             }
 
                         ?>
@@ -58,9 +58,9 @@ 
                             $supports = apply_filters( 'getapid_gateway_supports_subscription', $supports, $id );
 
                             if ( $supports ) {
-							echo "<i class='text-success fa fa-check'></i>";
+                            echo "<i class='text-success fa fa-check'></i>";
                             } else {
-							echo "<i class='text-dark fa fa-times'></i>";
+                            echo "<i class='text-dark fa fa-times'></i>";
                             }
 
                         ?>

Spacing +15 added lines, -15 removed lines

@@ -4,29 +4,29 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $gateways = wpinv_get_payment_gateways();
-ksort( $gateways );
+ksort($gateways);
 
 ?>
 <div class="table-responsive">
     <table id="wpinv_gateways_select" class="table border bg-white form-table">
-        <caption><?php echo esc_html_e( 'This table displays installed payment methods.', 'invoicing' ); ?></caption>
+        <caption><?php echo esc_html_e('This table displays installed payment methods.', 'invoicing'); ?></caption>
 
         <thead>
             <tr class="table-light">
 
                 <th scope="col" class="border-bottom border-top text-left">
-                    <?php esc_html_e( 'Payment Method', 'invoicing' ); ?>
+                    <?php esc_html_e('Payment Method', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top text-center">
-                    <?php esc_html_e( 'Enabled', 'invoicing' ); ?>
+                    <?php esc_html_e('Enabled', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top text-center">
-                    <?php esc_html_e( 'Supports Subscriptions', 'invoicing' ); ?>
+                    <?php esc_html_e('Supports Subscriptions', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top text-right" style="width:32px">&nbsp;</th>
@@ -35,15 +35,15 @@ 
         </thead>
 
         <tbody>
-            <?php foreach ( $gateways as $id => $gateway ) : ?>
+            <?php foreach ($gateways as $id => $gateway) : ?>
                 <tr>
                     <td class="getpaid-payment-method text-left">
-                        <a style="color: #0073aa;" href="<?php echo esc_url( add_query_arg( 'section', $id ) ); ?>" class="font-weight-bold"><?php echo esc_html( $gateway['admin_label'] ); ?></a>
+                        <a style="color: #0073aa;" href="<?php echo esc_url(add_query_arg('section', $id)); ?>" class="font-weight-bold"><?php echo esc_html($gateway['admin_label']); ?></a>
                     </td>
                     <td class="getpaid-payment-method-enabled text-center">
                         <?php
 
-                            if ( wpinv_is_gateway_active( $id ) ) {
+                            if (wpinv_is_gateway_active($id)) {
 							echo "<i class='text-success fa fa-check'></i>";
                             } else {
 							echo "<i class='text-dark fa fa-times'></i>";
@@ -54,10 +54,10 @@ 
                     <td class="getpaid-payment-method-subscription text-center">
                         <?php
 
-                            $supports = apply_filters( "wpinv_{$id}_support_subscription", false );
-                            $supports = apply_filters( 'getapid_gateway_supports_subscription', $supports, $id );
+                            $supports = apply_filters("wpinv_{$id}_support_subscription", false);
+                            $supports = apply_filters('getapid_gateway_supports_subscription', $supports, $id);
 
-                            if ( $supports ) {
+                            if ($supports) {
 							echo "<i class='text-success fa fa-check'></i>";
                             } else {
 							echo "<i class='text-dark fa fa-times'></i>";
@@ -67,7 +67,7 @@ 
                     </td>
 
                     <td class="getpaid-payment-method-action text-right">
-                        <a class="button button-secondary" href="<?php echo esc_url( add_query_arg( 'section', $id ) ); ?>"><?php esc_html_e( 'Manage', 'invoicing' ); ?></a>
+                        <a class="button button-secondary" href="<?php echo esc_url(add_query_arg('section', $id)); ?>"><?php esc_html_e('Manage', 'invoicing'); ?></a>
                     </td>
 
                 </tr>
@@ -77,8 +77,8 @@ 
         <tfoot>
             <tr class="table-light">
                 <td colspan="4" class="border-top">
-                    <a class="button button-secondary getpaid-install-gateways" href="<?php echo esc_url( admin_url( 'admin.php?page=wpi-addons&tab=gateways' ) ); ?>">
-                        <span><?php esc_html_e( 'Add Payment Methods', 'invoicing' ); ?></span>
+                    <a class="button button-secondary getpaid-install-gateways" href="<?php echo esc_url(admin_url('admin.php?page=wpi-addons&tab=gateways')); ?>">
+                        <span><?php esc_html_e('Add Payment Methods', 'invoicing'); ?></span>
                     </a>
                 </td>
             </tr>

includes/admin/views/wizard-plugins.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 						<input type="checkbox" name="plugins[<?php echo esc_attr( $plugin['slug'] ); ?>]" value="<?php echo esc_attr( $plugin['file'] ); ?>" class="custom-control-input"  
                                                                         <?php
                         if ( is_plugin_active( $plugin['slug'] ) ) {
-																								echo 'checked';}
+                                                                                                echo 'checked';}
 ?>
 >
 						<label class="custom-control-label" for="ac-setting-updates"></label>

Spacing +14 added lines, -14 removed lines

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

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

Indentation +34 added lines, -34 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -15,22 +15,22 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Shipping_Address {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
 
-		// Retrieve shipping address.
-		$shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
+        // Retrieve shipping address.
+        $shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
 
-		// Abort if it is invalid.
-		if ( ! is_array( $shipping_address ) ) {
-			return;
-		}
+        // Abort if it is invalid.
+        if ( ! is_array( $shipping_address ) ) {
+            return;
+        }
 
-		?>
+        ?>
 
 		<div class="bsui">
 
@@ -68,31 +68,31 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Prepares a value.
-	 *
-	 * @param array $address
-	 * @param string $key
-	 * @return string
-	 */
-	public static function prepare_for_display( $address, $key ) {
+    /**
+     * Prepares a value.
+     *
+     * @param array $address
+     * @param string $key
+     * @return string
+     */
+    public static function prepare_for_display( $address, $key ) {
 
-		// Prepare the value.
-		$value = $address[ $key ];
+        // Prepare the value.
+        $value = $address[ $key ];
 
-		if ( $key == 'country' ) {
-			$value = wpinv_country_name( $value );
-		}
+        if ( $key == 'country' ) {
+            $value = wpinv_country_name( $value );
+        }
 
-		if ( $key == 'state' ) {
-			$country = isset( $address['country'] ) ? $address['country'] : wpinv_get_default_country();
-			$value = wpinv_state_name( $value, $country );
-		}
+        if ( $key == 'state' ) {
+            $country = isset( $address['country'] ) ? $address['country'] : wpinv_get_default_country();
+            $value = wpinv_state_name( $value, $country );
+        }
 
-		return esc_html( $value );
+        return esc_html( $value );
 
-	}
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -20,13 +20,13 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 
 		// Retrieve shipping address.
-		$shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
+		$shipping_address = get_post_meta($post->ID, 'shipping_address', true);
 
 		// Abort if it is invalid.
-		if ( ! is_array( $shipping_address ) ) {
+		if (!is_array($shipping_address)) {
 			return;
 		}
 
@@ -34,29 +34,29 @@ 
 
 		<div class="bsui">
 
-			<?php if ( ! empty( $shipping_address['method'] ) ) : ?>
+			<?php if (!empty($shipping_address['method'])) : ?>
 
 				<div class="form-group form-row" style="color: green;">
 					<div class="col">
-						<span style="font-weight: 600"><?php esc_html_e( 'Shipping Method', 'invoicing' ); ?>:</span>
+						<span style="font-weight: 600"><?php esc_html_e('Shipping Method', 'invoicing'); ?>:</span>
 					</div>
 					<div class="col">
-						<?php echo wp_kses_post( $shipping_address['method'] ); ?>
+						<?php echo wp_kses_post($shipping_address['method']); ?>
 					</div>
 				</div>
 
 			<?php endif; ?>
 
-			<?php foreach ( getpaid_user_address_fields() as $key => $label ) : ?>
+			<?php foreach (getpaid_user_address_fields() as $key => $label) : ?>
 
-					<?php if ( ! empty( $shipping_address[ $key ] ) ) : ?>
+					<?php if (!empty($shipping_address[$key])) : ?>
 
 						<div class="form-group form-row">
 							<div class="col">
-								<span style="font-weight: 600"><?php echo esc_html( $label ); ?>:</span>
+								<span style="font-weight: 600"><?php echo esc_html($label); ?>:</span>
 							</div>
 							<div class="col">
-								<?php echo esc_html( self::prepare_for_display( $shipping_address, $key ) ); ?>
+								<?php echo esc_html(self::prepare_for_display($shipping_address, $key)); ?>
 							</div>
 						</div>
 
@@ -77,21 +77,21 @@ 
 	 * @param string $key
 	 * @return string
 	 */
-	public static function prepare_for_display( $address, $key ) {
+	public static function prepare_for_display($address, $key) {
 
 		// Prepare the value.
-		$value = $address[ $key ];
+		$value = $address[$key];
 
-		if ( $key == 'country' ) {
-			$value = wpinv_country_name( $value );
+		if ($key == 'country') {
+			$value = wpinv_country_name($value);
 		}
 
-		if ( $key == 'state' ) {
-			$country = isset( $address['country'] ) ? $address['country'] : wpinv_get_default_country();
-			$value = wpinv_state_name( $value, $country );
+		if ($key == 'state') {
+			$country = isset($address['country']) ? $address['country'] : wpinv_get_default_country();
+			$value = wpinv_state_name($value, $country);
 		}
 
-		return esc_html( $value );
+		return esc_html($value);
 
 	}
 

includes/admin/meta-boxes/class-getpaid-meta-box-discount-details.php

Indentation +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -17,10 +17,10 @@ 
 class GetPaid_Meta_Box_Discount_Details {
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
 
         // Prepare the discount.
@@ -396,35 +396,35 @@ 
     }
 
     /**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 */
-	public static function save( $post_id ) {
+     * Save meta box data.
+     *
+     * @param int $post_id
+     */
+    public static function save( $post_id ) {
 
         // Prepare the discount.
         $discount = new WPInv_Discount( $post_id );
 
         // Load new data.
         $discount->set_props(
-			array(
-				'code'           => isset( $_POST['wpinv_discount_code'] ) ? wpinv_clean( $_POST['wpinv_discount_code'] ) : null,
-				'amount'         => isset( $_POST['wpinv_discount_amount'] ) ? floatval( $_POST['wpinv_discount_amount'] ) : null,
-				'start'          => isset( $_POST['wpinv_discount_start'] ) ? wpinv_clean( $_POST['wpinv_discount_start'] ) : null,
-				'expiration'     => isset( $_POST['wpinv_discount_expiration'] ) ? wpinv_clean( $_POST['wpinv_discount_expiration'] ) : null,
-				'is_single_use'  => ! empty( $_POST['wpinv_discount_single_use'] ),
+            array(
+                'code'           => isset( $_POST['wpinv_discount_code'] ) ? wpinv_clean( $_POST['wpinv_discount_code'] ) : null,
+                'amount'         => isset( $_POST['wpinv_discount_amount'] ) ? floatval( $_POST['wpinv_discount_amount'] ) : null,
+                'start'          => isset( $_POST['wpinv_discount_start'] ) ? wpinv_clean( $_POST['wpinv_discount_start'] ) : null,
+                'expiration'     => isset( $_POST['wpinv_discount_expiration'] ) ? wpinv_clean( $_POST['wpinv_discount_expiration'] ) : null,
+                'is_single_use'  => ! empty( $_POST['wpinv_discount_single_use'] ),
                 'type'           => isset( $_POST['wpinv_discount_type'] ) ? wpinv_clean( $_POST['wpinv_discount_type'] ) : null,
-				'is_recurring'   => ! empty( $_POST['wpinv_discount_recurring'] ),
-				'items'          => isset( $_POST['wpinv_discount_items'] ) ? wpinv_clean( $_POST['wpinv_discount_items'] ) : array(),
-				'excluded_items' => isset( $_POST['wpinv_discount_excluded_items'] ) ? wpinv_clean( $_POST['wpinv_discount_excluded_items'] ) : array(),
+                'is_recurring'   => ! empty( $_POST['wpinv_discount_recurring'] ),
+                'items'          => isset( $_POST['wpinv_discount_items'] ) ? wpinv_clean( $_POST['wpinv_discount_items'] ) : array(),
+                'excluded_items' => isset( $_POST['wpinv_discount_excluded_items'] ) ? wpinv_clean( $_POST['wpinv_discount_excluded_items'] ) : array(),
                 'required_items' => isset( $_POST['wpinv_discount_required_items'] ) ? wpinv_clean( $_POST['wpinv_discount_required_items'] ) : array(),
-				'max_uses'       => isset( $_POST['wpinv_discount_max_uses'] ) ? intval( $_POST['wpinv_discount_max_uses'] ) : null,
-				'min_total'      => isset( $_POST['wpinv_discount_min_total'] ) ? floatval( $_POST['wpinv_discount_min_total'] ) : null,
-				'max_total'      => isset( $_POST['wpinv_discount_max_total'] ) ? floatval( $_POST['wpinv_discount_max_total'] ) : null,
-			)
+                'max_uses'       => isset( $_POST['wpinv_discount_max_uses'] ) ? intval( $_POST['wpinv_discount_max_uses'] ) : null,
+                'min_total'      => isset( $_POST['wpinv_discount_min_total'] ) ? floatval( $_POST['wpinv_discount_min_total'] ) : null,
+                'max_total'      => isset( $_POST['wpinv_discount_max_total'] ) ? floatval( $_POST['wpinv_discount_max_total'] ) : null,
+            )
         );
 
-		$discount->save();
-		do_action( 'getpaid_discount_metabox_save', $post_id, $discount );
-	}
+        $discount->save();
+        do_action( 'getpaid_discount_metabox_save', $post_id, $discount );
+    }
 }

Spacing +110 added lines, -110 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,24 +21,24 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Prepare the discount.
-        $discount = new WPInv_Discount( $post );
+        $discount = new WPInv_Discount($post);
 
         // Nonce field.
-        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+        wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
 
-        do_action( 'wpinv_discount_form_top', $discount );
+        do_action('wpinv_discount_form_top', $discount);
 
         // Set the currency position.
         $position = wpinv_currency_position();
 
-        if ( $position == 'left_space' ) {
+        if ($position == 'left_space') {
             $position = 'left';
         }
 
-        if ( $position == 'right_space' ) {
+        if ($position == 'right_space') {
             $position = 'right';
         }
 
@@ -52,68 +52,68 @@ 
         </style>
         <div class='bsui' style='max-width: 600px;padding-top: 10px;'>
 
-            <?php do_action( 'wpinv_discount_form_first', $discount ); ?>
+            <?php do_action('wpinv_discount_form_first', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_code', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_code', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_code" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Discount Code', 'invoicing' ); ?>
+                    <?php esc_html_e('Discount Code', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <div class="row">
                         <div class="col-sm-12 form-group">
-                            <input type="text" value="<?php echo esc_attr( $discount->get_code( 'edit' ) ); ?>" placeholder="SUMMER_SALE" name="wpinv_discount_code" id="wpinv_discount_code" style="width: 100%;" />
+                            <input type="text" value="<?php echo esc_attr($discount->get_code('edit')); ?>" placeholder="SUMMER_SALE" name="wpinv_discount_code" id="wpinv_discount_code" style="width: 100%;" />
                         </div>
                         <div class="col-sm-12">
                             <?php
-                                do_action( 'wpinv_discount_form_before_single_use', $discount );
+                                do_action('wpinv_discount_form_before_single_use', $discount);
 
                                 aui()->input(
                                     array(
                                         'id'      => 'wpinv_discount_single_use',
                                         'name'    => 'wpinv_discount_single_use',
                                         'type'    => 'checkbox',
-                                        'label'   => __( 'Each customer can only use this discount once', 'invoicing' ),
+                                        'label'   => __('Each customer can only use this discount once', 'invoicing'),
                                         'value'   => '1',
                                         'checked' => $discount->is_single_use(),
                                     ),
                                     true
                                 );
 
-                                do_action( 'wpinv_discount_form_single_use', $discount );
+                                do_action('wpinv_discount_form_single_use', $discount);
                             ?>
                         </div>
                         <div class="col-sm-12">
                             <?php
-                                do_action( 'wpinv_discount_form_before_recurring', $discount );
+                                do_action('wpinv_discount_form_before_recurring', $discount);
 
                                 aui()->input(
                                     array(
                                         'id'      => 'wpinv_discount_recurring',
                                         'name'    => 'wpinv_discount_recurring',
                                         'type'    => 'checkbox',
-                                        'label'   => __( 'Apply this discount to all recurring payments for subscriptions', 'invoicing' ),
+                                        'label'   => __('Apply this discount to all recurring payments for subscriptions', 'invoicing'),
                                         'value'   => '1',
                                         'checked' => $discount->is_recurring(),
                                     ),
                                     true
                                 );
 
-                                do_action( 'wpinv_discount_form_recurring', $discount );
+                                do_action('wpinv_discount_form_recurring', $discount);
                             ?>
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Enter a discount code such as 10OFF.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Enter a discount code such as 10OFF.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_code', $discount ); ?>
+            <?php do_action('wpinv_discount_form_code', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_type', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_type', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_type" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Discount Type', 'invoicing' ); ?>
+                    <?php esc_html_e('Discount Type', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -121,9 +121,9 @@ 
                             array(
                                 'id'               => 'wpinv_discount_type',
                                 'name'             => 'wpinv_discount_type',
-                                'label'            => __( 'Discount Type', 'invoicing' ),
-                                'placeholder'      => __( 'Select Discount Type', 'invoicing' ),
-                                'value'            => $discount->get_type( 'edit' ),
+                                'label'            => __('Discount Type', 'invoicing'),
+                                'placeholder'      => __('Select Discount Type', 'invoicing'),
+                                'value'            => $discount->get_type('edit'),
                                 'select2'          => true,
                                 'data-allow-clear' => 'false',
                                 'options'          => wpinv_get_discount_types(),
@@ -133,32 +133,32 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Discount type.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Discount type.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_type', $discount ); ?>
+            <?php do_action('wpinv_discount_form_type', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_amount', $discount ); ?>
-            <div class="form-group row <?php echo esc_attr( $discount->get_type( 'edit' ) ); ?>" id="wpinv_discount_amount_wrap">
+            <?php do_action('wpinv_discount_form_before_amount', $discount); ?>
+            <div class="form-group row <?php echo esc_attr($discount->get_type('edit')); ?>" id="wpinv_discount_amount_wrap">
                 <label for="wpinv_discount_amount" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Discount Amount', 'invoicing' ); ?>
+                    <?php esc_html_e('Discount Amount', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <div class="input-group input-group-sm">
-                        <?php if ( 'left' == $position ) : ?>
+                        <?php if ('left' == $position) : ?>
                             <div class="input-group-prepend left wpinv-if-flat">
                                 <span class="input-group-text">
-                                    <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
+                                    <?php echo wp_kses_post(wpinv_currency_symbol()); ?>
                                 </span>
                             </div>
                         <?php endif; ?>
 
-                        <input type="text" name="wpinv_discount_amount" id="wpinv_discount_amount" value="<?php echo esc_attr( $discount->get_amount( 'edit' ) ); ?>" placeholder="0" class="form-control">
+                        <input type="text" name="wpinv_discount_amount" id="wpinv_discount_amount" value="<?php echo esc_attr($discount->get_amount('edit')); ?>" placeholder="0" class="form-control">
 
-                        <?php if ( 'right' == $position ) : ?>
+                        <?php if ('right' == $position) : ?>
                             <div class="input-group-prepend left wpinv-if-flat">
                                 <span class="input-group-text">
-                                    <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
+                                    <?php echo wp_kses_post(wpinv_currency_symbol()); ?>
                                 </span>
                             </div>
                         <?php endif; ?>
@@ -168,15 +168,15 @@ 
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Enter the discount value. Ex: 10', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Enter the discount value. Ex: 10', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_amount', $discount ); ?>
+            <?php do_action('wpinv_discount_form_amount', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_items', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_items" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Items', 'invoicing' ); ?>
+                    <?php esc_html_e('Items', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -184,9 +184,9 @@ 
                             array(
                                 'id'               => 'wpinv_discount_items',
                                 'name'             => 'wpinv_discount_items[]',
-                                'label'            => __( 'Items', 'invoicing' ),
-                                'placeholder'      => __( 'Select Items', 'invoicing' ),
-                                'value'            => $discount->get_items( 'edit' ),
+                                'label'            => __('Items', 'invoicing'),
+                                'placeholder'      => __('Select Items', 'invoicing'),
+                                'value'            => $discount->get_items('edit'),
                                 'select2'          => true,
                                 'multiple'         => true,
                                 'data-allow-clear' => 'false',
@@ -197,15 +197,15 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Select the items that are allowed to use this discount or leave blank to use this discount all items.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Select the items that are allowed to use this discount or leave blank to use this discount all items.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_items', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_excluded_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_excluded_items', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_excluded_items" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Excluded Items', 'invoicing' ); ?>
+                    <?php esc_html_e('Excluded Items', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -213,9 +213,9 @@ 
                             array(
                                 'id'               => 'wpinv_discount_excluded_items',
                                 'name'             => 'wpinv_discount_excluded_items[]',
-                                'label'            => __( 'Excluded Items', 'invoicing' ),
-                                'placeholder'      => __( 'Select Items', 'invoicing' ),
-                                'value'            => $discount->get_excluded_items( 'edit' ),
+                                'label'            => __('Excluded Items', 'invoicing'),
+                                'placeholder'      => __('Select Items', 'invoicing'),
+                                'value'            => $discount->get_excluded_items('edit'),
                                 'select2'          => true,
                                 'multiple'         => true,
                                 'data-allow-clear' => 'false',
@@ -226,15 +226,15 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Select all the items that are not allowed to use this discount.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Select all the items that are not allowed to use this discount.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_excluded_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_excluded_items', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_required_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_required_items', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_required_items" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Required Items', 'invoicing' ); ?>
+                    <?php esc_html_e('Required Items', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -242,9 +242,9 @@ 
                             array(
                                 'id'               => 'wpinv_discount_required_items',
                                 'name'             => 'wpinv_discount_required_items[]',
-                                'label'            => __( 'Required Items', 'invoicing' ),
-                                'placeholder'      => __( 'Select Items', 'invoicing' ),
-                                'value'            => $discount->get_required_items( 'edit' ),
+                                'label'            => __('Required Items', 'invoicing'),
+                                'placeholder'      => __('Select Items', 'invoicing'),
+                                'value'            => $discount->get_required_items('edit'),
                                 'select2'          => true,
                                 'multiple'         => true,
                                 'data-allow-clear' => 'false',
@@ -255,15 +255,15 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Select all the items that are required to be in the cart before using this discount.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Select all the items that are required to be in the cart before using this discount.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_required_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_required_items', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_start', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_start', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_start" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Start Date', 'invoicing' ); ?>
+                    <?php esc_html_e('Start Date', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -272,10 +272,10 @@ 
                                 'type'             => 'datepicker',
                                 'id'               => 'wpinv_discount_start',
                                 'name'             => 'wpinv_discount_start',
-                                'label'            => __( 'Start Date', 'invoicing' ),
+                                'label'            => __('Start Date', 'invoicing'),
                                 'placeholder'      => 'YYYY-MM-DD 00:00',
                                 'class'            => 'form-control-sm',
-                                'value'            => $discount->get_start_date( 'edit' ),
+                                'value'            => $discount->get_start_date('edit'),
                                 'extra_attributes' => array(
                                     'data-enable-time' => 'true',
                                     'data-time_24hr'   => 'true',
@@ -287,15 +287,15 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_start', $discount ); ?>
+            <?php do_action('wpinv_discount_form_start', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_expiration', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_expiration', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_expiration" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Expiration Date', 'invoicing' ); ?>
+                    <?php esc_html_e('Expiration Date', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -304,10 +304,10 @@ 
                                 'type'             => 'datepicker',
                                 'id'               => 'wpinv_discount_expiration',
                                 'name'             => 'wpinv_discount_expiration',
-                                'label'            => __( 'Expiration Date', 'invoicing' ),
+                                'label'            => __('Expiration Date', 'invoicing'),
                                 'placeholder'      => 'YYYY-MM-DD 00:00',
                                 'class'            => 'form-control-sm',
-                                'value'            => $discount->get_end_date( 'edit' ),
+                                'value'            => $discount->get_end_date('edit'),
                                 'extra_attributes' => array(
                                     'data-enable-time' => 'true',
                                     'data-time_24hr'   => 'true',
@@ -321,86 +321,86 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Optionally set the date after which the discount will expire.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Optionally set the date after which the discount will expire.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_expiration', $discount ); ?>
+            <?php do_action('wpinv_discount_form_expiration', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_min_total', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_min_total', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_min_total" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Minimum Amount', 'invoicing' ); ?>
+                    <?php esc_html_e('Minimum Amount', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <div class="input-group input-group-sm">
-                        <?php if ( 'left' == $position ) : ?>
+                        <?php if ('left' == $position) : ?>
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol() ); ?></span>
+                                <span class="input-group-text"><?php echo wp_kses_post(wpinv_currency_symbol()); ?></span>
                             </div>
                         <?php endif; ?>
 
-                        <input type="text" name="wpinv_discount_min_total" id="wpinv_discount_min_total" value="<?php echo esc_attr( $discount->get_minimum_total( 'edit' ) ); ?>" placeholder="<?php esc_attr_e( 'No minimum', 'invoicing' ); ?>" class="form-control">
+                        <input type="text" name="wpinv_discount_min_total" id="wpinv_discount_min_total" value="<?php echo esc_attr($discount->get_minimum_total('edit')); ?>" placeholder="<?php esc_attr_e('No minimum', 'invoicing'); ?>" class="form-control">
 
-                        <?php if ( 'left' != $position ) : ?>
+                        <?php if ('left' != $position) : ?>
                             <div class="input-group-append">
-                                <span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol() ); ?></span>
+                                <span class="input-group-text"><?php echo wp_kses_post(wpinv_currency_symbol()); ?></span>
                             </div>
                         <?php endif; ?>
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Optionally set the minimum amount (including taxes) required to use this discount.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Optionally set the minimum amount (including taxes) required to use this discount.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_min_total', $discount ); ?>
+            <?php do_action('wpinv_discount_form_min_total', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_max_total', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_max_total', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_max_total" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Maximum Amount', 'invoicing' ); ?>
+                    <?php esc_html_e('Maximum Amount', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <div class="input-group input-group-sm">
-                        <?php if ( 'left' == $position ) : ?>
+                        <?php if ('left' == $position) : ?>
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol() ); ?></span>
+                                <span class="input-group-text"><?php echo wp_kses_post(wpinv_currency_symbol()); ?></span>
                             </div>
                         <?php endif; ?>
 
-                        <input type="text" name="wpinv_discount_max_total" id="wpinv_discount_max_total" value="<?php echo esc_attr( $discount->get_maximum_total( 'edit' ) ); ?>" placeholder="<?php esc_attr_e( 'No maximum', 'invoicing' ); ?>" class="form-control">
+                        <input type="text" name="wpinv_discount_max_total" id="wpinv_discount_max_total" value="<?php echo esc_attr($discount->get_maximum_total('edit')); ?>" placeholder="<?php esc_attr_e('No maximum', 'invoicing'); ?>" class="form-control">
 
-                        <?php if ( 'left' != $position ) : ?>
+                        <?php if ('left' != $position) : ?>
                             <div class="input-group-append">
-                                <span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol() ); ?></span>
+                                <span class="input-group-text"><?php echo wp_kses_post(wpinv_currency_symbol()); ?></span>
                             </div>
                         <?php endif; ?>
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Optionally set the maximum amount (including taxes) allowed when using this discount.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Optionally set the maximum amount (including taxes) allowed when using this discount.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_before_max_total', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_max_total', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_max_uses', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_max_uses', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_max_uses" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Maximum Uses', 'invoicing' ); ?>
+                    <?php esc_html_e('Maximum Uses', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
-                    <input type="text" value="<?php echo esc_attr( $discount->get_max_uses( 'edit' ) ); ?>" placeholder="<?php esc_attr_e( 'Unlimited', 'invoicing' ); ?>" name="wpinv_discount_max_uses" id="wpinv_discount_max_uses" style="width: 100%;" />
+                    <input type="text" value="<?php echo esc_attr($discount->get_max_uses('edit')); ?>" placeholder="<?php esc_attr_e('Unlimited', 'invoicing'); ?>" name="wpinv_discount_max_uses" id="wpinv_discount_max_uses" style="width: 100%;" />
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Optionally set the maximum number of times that this discount code can be used.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Optionally set the maximum number of times that this discount code can be used.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_max_uses', $discount ); ?>
+            <?php do_action('wpinv_discount_form_max_uses', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_last', $discount ); ?>
+            <?php do_action('wpinv_discount_form_last', $discount); ?>
 
         </div>
         <?php
-        do_action( 'wpinv_discount_form_bottom', $post );
+        do_action('wpinv_discount_form_bottom', $post);
     }
 
     /**
@@ -408,31 +408,31 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public static function save( $post_id ) {
+	public static function save($post_id) {
 
         // Prepare the discount.
-        $discount = new WPInv_Discount( $post_id );
+        $discount = new WPInv_Discount($post_id);
 
         // Load new data.
         $discount->set_props(
 			array(
-				'code'           => isset( $_POST['wpinv_discount_code'] ) ? wpinv_clean( $_POST['wpinv_discount_code'] ) : null,
-				'amount'         => isset( $_POST['wpinv_discount_amount'] ) ? floatval( $_POST['wpinv_discount_amount'] ) : null,
-				'start'          => isset( $_POST['wpinv_discount_start'] ) ? wpinv_clean( $_POST['wpinv_discount_start'] ) : null,
-				'expiration'     => isset( $_POST['wpinv_discount_expiration'] ) ? wpinv_clean( $_POST['wpinv_discount_expiration'] ) : null,
-				'is_single_use'  => ! empty( $_POST['wpinv_discount_single_use'] ),
-                'type'           => isset( $_POST['wpinv_discount_type'] ) ? wpinv_clean( $_POST['wpinv_discount_type'] ) : null,
-				'is_recurring'   => ! empty( $_POST['wpinv_discount_recurring'] ),
-				'items'          => isset( $_POST['wpinv_discount_items'] ) ? wpinv_clean( $_POST['wpinv_discount_items'] ) : array(),
-				'excluded_items' => isset( $_POST['wpinv_discount_excluded_items'] ) ? wpinv_clean( $_POST['wpinv_discount_excluded_items'] ) : array(),
-                'required_items' => isset( $_POST['wpinv_discount_required_items'] ) ? wpinv_clean( $_POST['wpinv_discount_required_items'] ) : array(),
-				'max_uses'       => isset( $_POST['wpinv_discount_max_uses'] ) ? intval( $_POST['wpinv_discount_max_uses'] ) : null,
-				'min_total'      => isset( $_POST['wpinv_discount_min_total'] ) ? floatval( $_POST['wpinv_discount_min_total'] ) : null,
-				'max_total'      => isset( $_POST['wpinv_discount_max_total'] ) ? floatval( $_POST['wpinv_discount_max_total'] ) : null,
+				'code'           => isset($_POST['wpinv_discount_code']) ? wpinv_clean($_POST['wpinv_discount_code']) : null,
+				'amount'         => isset($_POST['wpinv_discount_amount']) ? floatval($_POST['wpinv_discount_amount']) : null,
+				'start'          => isset($_POST['wpinv_discount_start']) ? wpinv_clean($_POST['wpinv_discount_start']) : null,
+				'expiration'     => isset($_POST['wpinv_discount_expiration']) ? wpinv_clean($_POST['wpinv_discount_expiration']) : null,
+				'is_single_use'  => !empty($_POST['wpinv_discount_single_use']),
+                'type'           => isset($_POST['wpinv_discount_type']) ? wpinv_clean($_POST['wpinv_discount_type']) : null,
+				'is_recurring'   => !empty($_POST['wpinv_discount_recurring']),
+				'items'          => isset($_POST['wpinv_discount_items']) ? wpinv_clean($_POST['wpinv_discount_items']) : array(),
+				'excluded_items' => isset($_POST['wpinv_discount_excluded_items']) ? wpinv_clean($_POST['wpinv_discount_excluded_items']) : array(),
+                'required_items' => isset($_POST['wpinv_discount_required_items']) ? wpinv_clean($_POST['wpinv_discount_required_items']) : array(),
+				'max_uses'       => isset($_POST['wpinv_discount_max_uses']) ? intval($_POST['wpinv_discount_max_uses']) : null,
+				'min_total'      => isset($_POST['wpinv_discount_min_total']) ? floatval($_POST['wpinv_discount_min_total']) : null,
+				'max_total'      => isset($_POST['wpinv_discount_max_total']) ? floatval($_POST['wpinv_discount_max_total']) : null,
 			)
         );
 
 		$discount->save();
-		do_action( 'getpaid_discount_metabox_save', $post_id, $discount );
+		do_action('getpaid_discount_metabox_save', $post_id, $discount);
 	}
 }

includes/admin/admin-pages.php

Indentation +16 added lines, -16 removed lines

@@ -57,8 +57,8 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Deactivate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
+        $anchor = __( 'Deactivate', 'invoicing' );
+        $title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
         $row_actions['deactivate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     } elseif ( in_array( strtolower( $discount->post_status ), array( 'pending', 'draft' ) ) ) {
@@ -73,8 +73,8 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Activate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
+        $anchor = __( 'Activate', 'invoicing' );
+        $title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
         $row_actions['activate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     }
@@ -91,8 +91,8 @@ 
             'getpaid-nonce'
         )
     );
-	$anchor = __( 'Delete', 'invoicing' );
-	$title  = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' );
+    $anchor = __( 'Delete', 'invoicing' );
+    $title  = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' );
     $row_actions['delete'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount );
@@ -118,13 +118,13 @@ 
             $types = wpinv_get_discount_types();
 
             foreach ( $types as $name => $type ) {
-			echo '<option value="' . esc_attr( $name ) . '"';
+            echo '<option value="' . esc_attr( $name ) . '"';
 
-			if ( isset( $_GET['discount_type'] ) ) {
-				selected( $name, sanitize_text_field( $_GET['discount_type'] ) );
+            if ( isset( $_GET['discount_type'] ) ) {
+                selected( $name, sanitize_text_field( $_GET['discount_type'] ) );
                 }
 
-			echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
+            echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
             }
         ?>
     </select>
@@ -151,15 +151,15 @@ 
         // Filter vat rule type
         if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) {
             $meta_query[] = array(
-				'key'     => '_wpi_discount_type',
-				'value'   => sanitize_key( urldecode( $_GET['discount_type'] ) ),
-				'compare' => '=',
-			);
-			}
+                'key'     => '_wpi_discount_type',
+                'value'   => sanitize_key( urldecode( $_GET['discount_type'] ) ),
+                'compare' => '=',
+            );
+            }
 
         if ( ! empty( $meta_query ) ) {
             $vars['meta_query'] = $meta_query;
-			}
+            }
     }
 
     return $vars;

Spacing +77 added lines, -77 removed lines

@@ -1,51 +1,51 @@ 
 <?php
 // MUST have WordPress.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
-add_action( 'manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column' );
-function wpinv_discount_custom_column( $column ) {
+add_action('manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column');
+function wpinv_discount_custom_column($column) {
     global $post;
 
-    $discount = new WPInv_Discount( $post );
+    $discount = new WPInv_Discount($post);
 
-    switch ( $column ) {
+    switch ($column) {
         case 'code':
-            echo esc_html( $discount->get_code() );
+            echo esc_html($discount->get_code());
             break;
         case 'amount':
-            echo wp_kses_post( $discount->get_formatted_amount() );
+            echo wp_kses_post($discount->get_formatted_amount());
             break;
         case 'usage':
-            echo wp_kses_post( $discount->get_usage() );
+            echo wp_kses_post($discount->get_usage());
             break;
         case 'start_date':
-            echo wp_kses_post( getpaid_format_date_value( $discount->get_start_date() ) );
+            echo wp_kses_post(getpaid_format_date_value($discount->get_start_date()));
             break;
         case 'expiry_date':
-            echo wp_kses_post( getpaid_format_date_value( $discount->get_expiration_date(), __( 'Never', 'invoicing' ) ) );
+            echo wp_kses_post(getpaid_format_date_value($discount->get_expiration_date(), __('Never', 'invoicing')));
             break;
     }
 }
 
-add_filter( 'post_row_actions', 'wpinv_post_row_actions', 90, 2 );
-function wpinv_post_row_actions( $actions, $post ) {
-    $post_type = ! empty( $post->post_type ) ? $post->post_type : '';
+add_filter('post_row_actions', 'wpinv_post_row_actions', 90, 2);
+function wpinv_post_row_actions($actions, $post) {
+    $post_type = !empty($post->post_type) ? $post->post_type : '';
 
-    if ( $post_type == 'wpi_discount' ) {
-        $actions = wpinv_discount_row_actions( $post, $actions );
+    if ($post_type == 'wpi_discount') {
+        $actions = wpinv_discount_row_actions($post, $actions);
     }
 
     return $actions;
 }
 
-function wpinv_discount_row_actions( $discount, $row_actions ) {
-    $row_actions  = array();
-    $edit_link = get_edit_post_link( $discount->ID );
-    $row_actions['edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit', 'invoicing' ) . '</a>';
+function wpinv_discount_row_actions($discount, $row_actions) {
+    $row_actions = array();
+    $edit_link = get_edit_post_link($discount->ID);
+    $row_actions['edit'] = '<a href="' . esc_url($edit_link) . '">' . __('Edit', 'invoicing') . '</a>';
 
-    if ( in_array( strtolower( $discount->post_status ), array( 'publish' ) ) ) {
+    if (in_array(strtolower($discount->post_status), array('publish'))) {
 
         $url = wp_nonce_url(
             add_query_arg(
@@ -57,13 +57,13 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Deactivate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
+		$anchor = __('Deactivate', 'invoicing');
+		$title  = esc_attr__('Are you sure you want to deactivate this discount?', 'invoicing');
         $row_actions['deactivate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
-    } elseif ( in_array( strtolower( $discount->post_status ), array( 'pending', 'draft' ) ) ) {
+    } elseif (in_array(strtolower($discount->post_status), array('pending', 'draft'))) {
 
-        $url    = wp_nonce_url(
+        $url = wp_nonce_url(
             add_query_arg(
                 array(
                     'getpaid-admin-action' => 'activate_discount',
@@ -73,13 +73,13 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Activate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
+		$anchor = __('Activate', 'invoicing');
+		$title  = esc_attr__('Are you sure you want to activate this discount?', 'invoicing');
         $row_actions['activate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     }
 
-    $url    = esc_url(
+    $url = esc_url(
         wp_nonce_url(
             add_query_arg(
                 array(
@@ -91,11 +91,11 @@ 
             'getpaid-nonce'
         )
     );
-	$anchor = __( 'Delete', 'invoicing' );
-	$title  = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' );
+	$anchor = __('Delete', 'invoicing');
+	$title  = esc_attr__('Are you sure you want to delete this discount?', 'invoicing');
     $row_actions['delete'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
-    $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount );
+    $row_actions = apply_filters('wpinv_discount_row_actions', $row_actions, $discount);
 
     return $row_actions;
 }
@@ -103,68 +103,68 @@ 
 function wpinv_restrict_manage_posts() {
     global $typenow;
 
-    if ( 'wpi_discount' == $typenow ) {
+    if ('wpi_discount' == $typenow) {
         wpinv_discount_filters();
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_restrict_manage_posts', 10 );
+add_action('restrict_manage_posts', 'wpinv_restrict_manage_posts', 10);
 
 function wpinv_discount_filters() {
 
     ?>
     <select name="discount_type" id="dropdown_wpinv_discount_type">
-        <option value=""><?php esc_html_e( 'Show all types', 'invoicing' ); ?></option>
+        <option value=""><?php esc_html_e('Show all types', 'invoicing'); ?></option>
         <?php
             $types = wpinv_get_discount_types();
 
-            foreach ( $types as $name => $type ) {
-			echo '<option value="' . esc_attr( $name ) . '"';
+            foreach ($types as $name => $type) {
+			echo '<option value="' . esc_attr($name) . '"';
 
-			if ( isset( $_GET['discount_type'] ) ) {
-				selected( $name, sanitize_text_field( $_GET['discount_type'] ) );
+			if (isset($_GET['discount_type'])) {
+				selected($name, sanitize_text_field($_GET['discount_type']));
                 }
 
-			echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
+			echo '>' . esc_html__($type, 'invoicing') . '</option>';
             }
         ?>
     </select>
     <?php
 }
 
-function wpinv_request( $vars ) {
+function wpinv_request($vars) {
     global $typenow, $wp_post_statuses;
 
-    if ( getpaid_is_invoice_post_type( $typenow ) ) {
-        if ( ! isset( $vars['post_status'] ) ) {
-            $post_statuses = wpinv_get_invoice_statuses( false, false, $typenow );
+    if (getpaid_is_invoice_post_type($typenow)) {
+        if (!isset($vars['post_status'])) {
+            $post_statuses = wpinv_get_invoice_statuses(false, false, $typenow);
 
-            foreach ( $post_statuses as $status => $value ) {
-                if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) {
-                    unset( $post_statuses[ $status ] );
+            foreach ($post_statuses as $status => $value) {
+                if (isset($wp_post_statuses[$status]) && false === $wp_post_statuses[$status]->show_in_admin_all_list) {
+                    unset($post_statuses[$status]);
                 }
             }
 
-            $vars['post_status'] = array_keys( $post_statuses );
+            $vars['post_status'] = array_keys($post_statuses);
         }
-} elseif ( 'wpi_discount' == $typenow ) {
-        $meta_query = ! empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+} elseif ('wpi_discount' == $typenow) {
+        $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array();
         // Filter vat rule type
-        if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) {
+        if (isset($_GET['discount_type']) && $_GET['discount_type'] !== '') {
             $meta_query[] = array(
 				'key'     => '_wpi_discount_type',
-				'value'   => sanitize_key( urldecode( $_GET['discount_type'] ) ),
+				'value'   => sanitize_key(urldecode($_GET['discount_type'])),
 				'compare' => '=',
 			);
 			}
 
-        if ( ! empty( $meta_query ) ) {
+        if (!empty($meta_query)) {
             $vars['meta_query'] = $meta_query;
 			}
     }
 
     return $vars;
 }
-add_filter( 'request', 'wpinv_request' );
+add_filter('request', 'wpinv_request');
 
 /**
  * Create a page and store the ID in an option.
@@ -176,61 +176,61 @@ 
  * @param int $post_parent (default: 0) Parent for the new page
  * @return int page ID
  */
-function wpinv_create_page( $slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0 ) {
+function wpinv_create_page($slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0) {
     global $wpdb;
 
-    $option_value = wpinv_get_option( $option );
+    $option_value = wpinv_get_option($option);
 
-    if ( ! empty( $option_value ) && ( $page_object = get_post( $option_value ) ) ) {
-        if ( 'page' === $page_object->post_type && ! in_array( $page_object->post_status, array( 'pending', 'trash', 'future', 'auto-draft' ) ) ) {
+    if (!empty($option_value) && ($page_object = get_post($option_value))) {
+        if ('page' === $page_object->post_type && !in_array($page_object->post_status, array('pending', 'trash', 'future', 'auto-draft'))) {
             // Valid page is already in place
             return $page_object->ID;
         }
     }
 
-    if ( ! empty( $post_parent ) ) {
-        $page = get_page_by_path( $post_parent );
-        if ( $page ) {
+    if (!empty($post_parent)) {
+        $page = get_page_by_path($post_parent);
+        if ($page) {
             $post_parent = $page->ID;
         } else {
             $post_parent = '';
         }
     }
 
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug));
     }
 
-    $valid_page_found = apply_filters( 'wpinv_create_page_id', $valid_page_found, $slug, $page_content );
+    $valid_page_found = apply_filters('wpinv_create_page_id', $valid_page_found, $slug, $page_content);
 
-    if ( $valid_page_found ) {
-        if ( $option ) {
-            wpinv_update_option( $option, $valid_page_found );
+    if ($valid_page_found) {
+        if ($option) {
+            wpinv_update_option($option, $valid_page_found);
         }
         return $valid_page_found;
     }
 
     // Search for a matching valid trashed page
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug));
     }
 
-    if ( $trashed_page_found ) {
+    if ($trashed_page_found) {
         $page_id   = $trashed_page_found;
         $page_data = array(
             'ID'          => $page_id,
             'post_status' => 'publish',
             'post_parent' => $post_parent,
         );
-        wp_update_post( $page_data );
+        wp_update_post($page_data);
     } else {
         $page_data = array(
             'post_status'    => 'publish',
@@ -242,11 +242,11 @@ 
             'post_parent'    => $post_parent,
             'comment_status' => 'closed',
         );
-        $page_id = wp_insert_post( $page_data );
+        $page_id = wp_insert_post($page_data);
     }
 
-    if ( $option ) {
-        wpinv_update_option( $option, (int) $page_id );
+    if ($option) {
+        wpinv_update_option($option, (int) $page_id);
     }
 
     return $page_id;
@@ -259,11 +259,11 @@ 
  *
  * @return array
  */
-function wpinv_add_aui_screens( $screen_ids ) {
+function wpinv_add_aui_screens($screen_ids) {
 
     // load on these pages if set
-    $screen_ids = array_merge( $screen_ids, wpinv_get_screen_ids() );
+    $screen_ids = array_merge($screen_ids, wpinv_get_screen_ids());
 
     return $screen_ids;
 }
-add_filter( 'aui_screen_ids', 'wpinv_add_aui_screens' );
+add_filter('aui_screen_ids', 'wpinv_add_aui_screens');

includes/admin/class-wpinv-admin-menus.php

Indentation +11 added lines, -11 removed lines

@@ -24,14 +24,14 @@ 
     }
 
     /**
-	 * Highlights sub menus.
-	 */
-	public function set_admin_menu_class() {
-		global $current_screen, $parent_file, $submenu_file;
+     * Highlights sub menus.
+     */
+    public function set_admin_menu_class() {
+        global $current_screen, $parent_file, $submenu_file;
 
         if ( ! empty( $current_screen->id ) && in_array( $current_screen->id, array( 'wpi_discount', 'wpi_payment_form', 'wpi_invoice' ) ) ) {
-			$parent_file = 'wpinv';
-			$submenu_file = 'edit.php?post_type=' . $current_screen->id;
+            $parent_file = 'wpinv';
+            $submenu_file = 'edit.php?post_type=' . $current_screen->id;
         }
 
     }
@@ -165,8 +165,8 @@ 
                 foreach ( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
                     $tab_url = add_query_arg(
                         array(
-							'settings-updated' => false,
-							'tab'              => $tab_id,
+                            'settings-updated' => false,
+                            'tab'              => $tab_id,
                         ),
                         'admin.php?page=wpinv-settings'
                     );
@@ -193,9 +193,9 @@ 
                     $number++;
                     $tab_url = add_query_arg(
                         array(
-							'settings-updated' => false,
-							'tab'              => $active_tab,
-							'section'          => $section_id,
+                            'settings-updated' => false,
+                            'tab'              => $active_tab,
+                            'section'          => $section_id,
                         ),
                         admin_url( 'admin.php?page=wpinv-settings' )
                     );

Spacing +77 added lines, -77 removed lines

@@ -3,7 +3,7 @@ 
  * Setup menus in WP admin.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Admin_Menus Class.
@@ -13,14 +13,14 @@ 
      * Hook in tabs.
      */
     public function __construct() {
-        add_action( 'admin_head', array( $this, 'set_admin_menu_class' ) );
-        add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-        add_action( 'admin_menu', array( $this, 'add_customers_menu' ), 18 );
-        add_action( 'admin_menu', array( $this, 'add_subscriptions_menu' ), 40 );
-        add_action( 'admin_menu', array( $this, 'add_addons_menu' ), 100 );
-        add_action( 'admin_menu', array( $this, 'add_settings_menu' ), 60 );
-        add_action( 'admin_menu', array( $this, 'remove_admin_submenus' ), 10 );
-        add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
+        add_action('admin_head', array($this, 'set_admin_menu_class'));
+        add_action('admin_menu', array($this, 'admin_menu'), 10);
+        add_action('admin_menu', array($this, 'add_customers_menu'), 18);
+        add_action('admin_menu', array($this, 'add_subscriptions_menu'), 40);
+        add_action('admin_menu', array($this, 'add_addons_menu'), 100);
+        add_action('admin_menu', array($this, 'add_settings_menu'), 60);
+        add_action('admin_menu', array($this, 'remove_admin_submenus'), 10);
+        add_action('admin_head-nav-menus.php', array($this, 'add_nav_menu_meta_boxes'));
     }
 
     /**
@@ -29,7 +29,7 @@ 
 	public function set_admin_menu_class() {
 		global $current_screen, $parent_file, $submenu_file;
 
-        if ( ! empty( $current_screen->id ) && in_array( $current_screen->id, array( 'wpi_discount', 'wpi_payment_form', 'wpi_invoice' ) ) ) {
+        if (!empty($current_screen->id) && in_array($current_screen->id, array('wpi_discount', 'wpi_payment_form', 'wpi_invoice'))) {
 			$parent_file = 'wpinv';
 			$submenu_file = 'edit.php?post_type=' . $current_screen->id;
         }
@@ -38,14 +38,14 @@ 
 
     public function admin_menu() {
 
-        $capability = apply_filters( 'invoicing_capability', wpinv_get_capability() );
+        $capability = apply_filters('invoicing_capability', wpinv_get_capability());
         add_menu_page(
-            __( 'GetPaid', 'invoicing' ),
-            __( 'GetPaid', 'invoicing' ),
+            __('GetPaid', 'invoicing'),
+            __('GetPaid', 'invoicing'),
             $capability,
             'wpinv',
             null,
-            'data:image/svg+xml;base64,' . base64_encode( file_get_contents( WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg' ) ),
+            'data:image/svg+xml;base64,' . base64_encode(file_get_contents(WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg')),
             '54.123460'
         );
 
@@ -57,11 +57,11 @@ 
     public function add_customers_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Customers', 'invoicing' ),
-            __( 'Customers', 'invoicing' ),
+            __('Customers', 'invoicing'),
+            __('Customers', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-customers',
-            array( $this, 'customers_page' )
+            array($this, 'customers_page')
         );
     }
 
@@ -71,8 +71,8 @@ 
     public function add_subscriptions_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Subscriptions', 'invoicing' ),
-            __( 'Subscriptions', 'invoicing' ),
+            __('Subscriptions', 'invoicing'),
+            __('Subscriptions', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-subscriptions',
             'wpinv_subscriptions_page'
@@ -91,12 +91,12 @@ 
                     width: 30%;
                 }
             </style>
-            <h1><?php echo esc_html( __( 'Customers', 'invoicing' ) ); ?>&nbsp;<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'getpaid-admin-action', 'download_customers' ), 'getpaid-nonce', 'getpaid-nonce' ) ); ?>" class="page-title-action"><?php esc_html_e( 'Export', 'invoicing' ); ?></a></h1>
+            <h1><?php echo esc_html(__('Customers', 'invoicing')); ?>&nbsp;<a href="<?php echo esc_url(wp_nonce_url(add_query_arg('getpaid-admin-action', 'download_customers'), 'getpaid-nonce', 'getpaid-nonce')); ?>" class="page-title-action"><?php esc_html_e('Export', 'invoicing'); ?></a></h1>
             <form method="post">
             <?php
                 $table = new WPInv_Customers_Table();
                 $table->prepare_items();
-                $table->search_box( __( 'Search Customers', 'invoicing' ), 'search-customers' );
+                $table->search_box(__('Search Customers', 'invoicing'), 'search-customers');
                 $table->display();
             ?>
             </form>
@@ -110,26 +110,26 @@ 
     public function add_settings_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Invoice Settings', 'invoicing' ),
-            __( 'Settings', 'invoicing' ),
-            apply_filters( 'invoicing_capability', wpinv_get_capability() ),
+            __('Invoice Settings', 'invoicing'),
+            __('Settings', 'invoicing'),
+            apply_filters('invoicing_capability', wpinv_get_capability()),
             'wpinv-settings',
-            array( $this, 'options_page' )
+            array($this, 'options_page')
         );
     }
 
     public function add_addons_menu() {
-        if ( ! apply_filters( 'wpi_show_addons_page', true ) ) {
+        if (!apply_filters('wpi_show_addons_page', true)) {
             return;
         }
 
         add_submenu_page(
             'wpinv',
-            __( 'Invoicing extensions', 'invoicing' ),
-            __( 'Extensions', 'invoicing' ),
+            __('Invoicing extensions', 'invoicing'),
+            __('Extensions', 'invoicing'),
             'manage_options',
             'wpi-addons',
-            array( $this, 'addons_page' )
+            array($this, 'addons_page')
         );
     }
 
@@ -140,29 +140,29 @@ 
 
     function options_page() {
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             return;
         }
 
         $settings_tabs = wpinv_get_settings_tabs();
-        $settings_tabs = empty( $settings_tabs ) ? array() : $settings_tabs;
-        $active_tab    = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $settings_tabs ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
-        $sections      = wpinv_get_settings_tab_sections( $active_tab );
+        $settings_tabs = empty($settings_tabs) ? array() : $settings_tabs;
+        $active_tab    = isset($_GET['tab']) && array_key_exists($_GET['tab'], $settings_tabs) ? sanitize_text_field($_GET['tab']) : 'general';
+        $sections      = wpinv_get_settings_tab_sections($active_tab);
         $key           = 'main';
 
-        if ( is_array( $sections ) ) {
-            $key = key( $sections );
+        if (is_array($sections)) {
+            $key = key($sections);
         }
 
         add_thickbox();
 
-        $registered_sections = wpinv_get_settings_tab_sections( $active_tab );
-        $section             = isset( $_GET['section'] ) && ! empty( $registered_sections ) && array_key_exists( $_GET['section'], $registered_sections ) ? sanitize_text_field( $_GET['section'] ) : $key;
+        $registered_sections = wpinv_get_settings_tab_sections($active_tab);
+        $section             = isset($_GET['section']) && !empty($registered_sections) && array_key_exists($_GET['section'], $registered_sections) ? sanitize_text_field($_GET['section']) : $key;
         ?>
         <div class="wrap">
             <h1 class="nav-tab-wrapper">
                 <?php
-                foreach ( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
+                foreach (wpinv_get_settings_tabs() as $tab_id => $tab_name) {
                     $tab_url = add_query_arg(
                         array(
 							'settings-updated' => false,
@@ -172,23 +172,23 @@ 
                     );
 
                     // Remove the section from the tabs so we always end up at the main section
-                    $tab_url = remove_query_arg( 'section', $tab_url );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    $tab_url = remove_query_arg('section', $tab_url);
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
 
                     $active = $active_tab == $tab_id ? ' nav-tab-active' : '';
 
-                    echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . esc_attr( $active ) . '">';
-                    echo esc_html( $tab_name );
+                    echo '<a href="' . esc_url($tab_url) . '" title="' . esc_attr($tab_name) . '" class="nav-tab' . esc_attr($active) . '">';
+                    echo esc_html($tab_name);
                     echo '</a>';
                 }
                 ?>
             </h1>
             <?php
-            $number_of_sections = count( $sections );
+            $number_of_sections = count($sections);
             $number = 0;
-            if ( $number_of_sections > 1 ) {
+            if ($number_of_sections > 1) {
                 echo '<div><ul class="subsubsub">';
-                foreach ( $sections as $section_id => $section_name ) {
+                foreach ($sections as $section_id => $section_name) {
                     echo '<li>';
                     $number++;
                     $tab_url = add_query_arg(
@@ -197,16 +197,16 @@ 
 							'tab'              => $active_tab,
 							'section'          => $section_id,
                         ),
-                        admin_url( 'admin.php?page=wpinv-settings' )
+                        admin_url('admin.php?page=wpinv-settings')
                     );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
                     $class = '';
-                    if ( $section == $section_id ) {
+                    if ($section == $section_id) {
                         $class = 'current';
                     }
-                    echo '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $tab_url ) . '">' . esc_html( $section_name ) . '</a>';
+                    echo '<a class="' . esc_attr($class) . '" href="' . esc_url($tab_url) . '">' . esc_html($section_name) . '</a>';
 
-                    if ( $number != $number_of_sections ) {
+                    if ($number != $number_of_sections) {
                         echo ' | ';
                     }
                     echo '</li>';
@@ -218,20 +218,20 @@ 
                 <form method="post" action="options.php">
                     <table class="form-table">
                         <?php
-                        settings_fields( 'wpinv_settings' );
+                        settings_fields('wpinv_settings');
 
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_top', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_top', $active_tab);
                         }
 
-                        do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'getpaid_settings_tab_bottom', $active_tab, $section );
+                        do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('getpaid_settings_tab_bottom', $active_tab, $section);
 
                         // For backwards compatibility
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_bottom', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_bottom', $active_tab);
                         }
                         ?>
                     </table>
@@ -243,7 +243,7 @@ 
     }
 
     public function remove_admin_submenus() {
-        remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
+        remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
     }
 
     /**
@@ -253,8 +253,8 @@ 
 
         add_meta_box(
             'wpinv_endpoints_nav_link',
-            __( 'GetPaid endpoints', 'invoicing' ),
-            array( $this, 'nav_menu_links' ),
+            __('GetPaid endpoints', 'invoicing'),
+            array($this, 'nav_menu_links'),
             'nav-menus',
             'side',
             'low'
@@ -269,12 +269,12 @@ 
         $endpoints = $this->get_menu_items();
         ?>
         <div id="invoicing-endpoints" class="posttypediv">
-            <?php if ( ! empty( $endpoints['pages'] ) ) : ?>
+            <?php if (!empty($endpoints['pages'])) : ?>
                 <div id="tabs-panel-invoicing-endpoints" class="tabs-panel tabs-panel-active">
                     <ul id="invoicing-endpoints-checklist" class="categorychecklist form-no-clear">
                         <?php
-                            $walker = new Walker_Nav_Menu_Checklist( array() );
-                            echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $endpoints['pages'] ), 0, (object) array( 'walker' => $walker ) );
+                            $walker = new Walker_Nav_Menu_Checklist(array());
+                            echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $endpoints['pages']), 0, (object) array('walker' => $walker));
                         ?>
                     </ul>
                 </div>
@@ -283,11 +283,11 @@ 
             <p class="button-controls wp-clearfix" data-items-type="invoicing-endpoints">
                 <span class="list-controls hide-if-no-js">
                     <input type="checkbox" id="invoicing-endpoints-tab" class="select-all">
-                    <label for="invoicing-endpoints-tab"><?php esc_html_e( 'Select all', 'invoicing' ); ?></label>
+                    <label for="invoicing-endpoints-tab"><?php esc_html_e('Select all', 'invoicing'); ?></label>
                 </span>
 
                 <span class="add-to-menu">
-                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'invoicing' ); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
+                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to menu', 'invoicing'); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
                     <span class="spinner"></span>
                 </span>
             </p>
@@ -305,18 +305,18 @@ 
 
         $pages = array(
             array(
-                'id'    => wpinv_get_option( 'invoice_history_page' ),
-                'label' => __( 'My Invoices', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_history_page'),
+                'label' => __('My Invoices', 'invoicing'),
             ),
             array(
-                'id'    => wpinv_get_option( 'invoice_subscription_page' ),
-                'label' => __( 'My Subscriptions', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_subscription_page'),
+                'label' => __('My Subscriptions', 'invoicing'),
             ),
         );
 
-        foreach ( apply_filters( 'getpaid_menu_pages', $pages ) as $page ) {
+        foreach (apply_filters('getpaid_menu_pages', $pages) as $page) {
 
-            if ( (int) $page['id'] > 0 ) {
+            if ((int) $page['id'] > 0) {
 
                 $item                   = new stdClass();
                 $item->object_id        = (int) $page['id'];
@@ -324,11 +324,11 @@ 
                 $item->object           = 'page';
                 $item->menu_item_parent = 0;
                 $item->type             = 'post_type';
-                $item->title            = esc_html( $page['label'] );
-                $item->url              = get_permalink( (int) $page['id'] );
+                $item->title            = esc_html($page['label']);
+                $item->url              = get_permalink((int) $page['id']);
                 $item->target           = '';
                 $item->attr_title       = '';
-                $item->classes          = array( 'wpinv-menu-item' );
+                $item->classes          = array('wpinv-menu-item');
                 $item->xfn              = '';
 
                 $items['pages'][]       = $item;
@@ -336,7 +336,7 @@ 
             }
 }
 
-        return apply_filters( 'wpinv_menu_items', $items );
+        return apply_filters('wpinv_menu_items', $items);
     }
 
 }

includes/class-wpinv-addons.php

Indentation +210 added lines, -210 removed lines

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

Spacing +98 added lines, -98 removed lines

@@ -5,7 +5,7 @@ 
  * All Invoicing extensions screen related functions can be found here.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -22,10 +22,10 @@ 
 	 */
 	public function get_tabs() {
 		$tabs = array(
-			'addons'              => __( 'Addons', 'invoicing' ),
-            'gateways'            => __( 'Payment Gateways', 'invoicing' ),
-            'recommended_plugins' => __( 'Recommended plugins', 'invoicing' ),
-            'membership'          => __( 'Membership', 'invoicing' ),
+			'addons'              => __('Addons', 'invoicing'),
+            'gateways'            => __('Payment Gateways', 'invoicing'),
+            'recommended_plugins' => __('Recommended plugins', 'invoicing'),
+            'membership'          => __('Membership', 'invoicing'),
 		);
 
 		return $tabs;
@@ -38,57 +38,57 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_section_data( $section_id ) {
-		$section      = self::get_tab( $section_id );
+	public function get_section_data($section_id) {
+		$section      = self::get_tab($section_id);
 		$api_url = 'https://wpinvoicing.com/edd-api/v2/products/';
 		$section_data = new stdClass();
 
-		if ( $section_id == 'recommended_plugins' ) {
+		if ($section_id == 'recommended_plugins') {
 			$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
-		} elseif ( ! empty( $section ) ) {
-			if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
+		} elseif (!empty($section)) {
+			if (false === ($section_data = get_transient('wpi_addons_section_' . $section_id))) { //@todo restore after testing
 			//if ( 1==1) {
 
 				$query_args = array(
 					'category' => $section_id,
 					'number'   => 100,
 				);
-				$query_args = apply_filters( 'wpeu_edd_api_query_args', $query_args, $api_url, $section_id );
+				$query_args = apply_filters('wpeu_edd_api_query_args', $query_args, $api_url, $section_id);
 
 				$raw_section = wp_safe_remote_get(
-                    esc_url_raw( add_query_arg( $query_args, $api_url ) ),
+                    esc_url_raw(add_query_arg($query_args, $api_url)),
                     array(
 						'user-agent' => 'Invoicing Addons Page',
 						'timeout'    => 15,
                     )
                 );
 
-				if ( ! is_wp_error( $raw_section ) ) {
-					$section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
+				if (!is_wp_error($raw_section)) {
+					$section_data = json_decode(wp_remote_retrieve_body($raw_section));
 
-					if ( ! empty( $section_data->products ) ) {
-						set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
+					if (!empty($section_data->products)) {
+						set_transient('wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS);
 					}
 				}
 			}
 }
 
-		$products = isset( $section_data->products ) ? $section_data->products : array();
-		if ( 'addons' == $section_id ) {
+		$products = isset($section_data->products) ? $section_data->products : array();
+		if ('addons' == $section_id) {
 
 			$quotes = new stdClass();
 			$quotes->info = new stdClass();
 			$quotes->info->id = '';
 			$quotes->info->slug = 'invoicing-quotes';
-			$quotes->info->title = __( 'Quotes', 'invoicing' );
-			$quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
+			$quotes->info->title = __('Quotes', 'invoicing');
+			$quotes->info->excerpt = __('Create quotes and estimates', 'invoicing');
 			$quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
 			$quotes->info->thumbnail = WPINV_PLUGIN_URL . 'assets/images/Quotes-1-768x384.png';
 
 			$products[] = $quotes;
 		}
 
-		return apply_filters( 'wpi_addons_section_data', $products, $section_id );
+		return apply_filters('wpi_addons_section_data', $products, $section_id);
 	}
 
 	/**
@@ -99,8 +99,8 @@ 
 	 * @param string $theme
 	 * @param string $plugin
 	 */
-	public function output_button( $addon ) {
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+	public function output_button($addon) {
+		$current_tab = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -112,30 +112,30 @@ 
 //		$install_status = 'get';
 //		$onclick = '';
 
-		$wp_org_themes = array( 'supreme-directory', 'directory-starter' );
+		$wp_org_themes = array('supreme-directory', 'directory-starter');
 
 		$button_args = array(
 			'type'           => ($current_tab == 'addons' || $current_tab == 'gateways') ? 'addons' : $current_tab,
-			'id'             => isset( $addon->info->id ) ? absint( $addon->info->id ) : '',
-			'title'          => isset( $addon->info->title ) ? $addon->info->title : '',
-			'button_text'    => __( 'Free', 'invoicing' ),
-			'price_text'     => __( 'Free', 'invoicing' ),
-			'link'           => isset( $addon->info->link ) ? $addon->info->link : '', // link to product
-			'url'            => isset( $addon->info->link ) ? $addon->info->link : '', // button url
+			'id'             => isset($addon->info->id) ? absint($addon->info->id) : '',
+			'title'          => isset($addon->info->title) ? $addon->info->title : '',
+			'button_text'    => __('Free', 'invoicing'),
+			'price_text'     => __('Free', 'invoicing'),
+			'link'           => isset($addon->info->link) ? $addon->info->link : '', // link to product
+			'url'            => isset($addon->info->link) ? $addon->info->link : '', // button url
 			'class'          => 'button-primary',
 			'install_status' => 'get',
 			'installed'      => false,
 			'price'          => '',
-			'licensing'      => isset( $addon->licensing->enabled ) && $addon->licensing->enabled ? true : false,
-			'license'        => isset( $addon->licensing->license ) && $addon->licensing->license ? $addon->licensing->license : '',
+			'licensing'      => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
+			'license'        => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
 			'onclick'        => '',
-			'slug'           => isset( $addon->info->slug ) ? $addon->info->slug : '',
+			'slug'           => isset($addon->info->slug) ? $addon->info->slug : '',
 			'active'         => false,
 			'file'           => '',
 			'update_url'     => '',
 		);
 
-		if ( 'invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ( $current_tab == 'recommended_plugins' && isset( $addon->info->slug ) && $addon->info->slug ) ) {
+		if ('invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug)) {
 			include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
 			$status = install_plugin_install_status(
                 array(
@@ -143,81 +143,81 @@ 
 					'version' => '',
                 )
             );
-			$button_args['install_status'] = isset( $status['status'] ) ? $status['status'] : 'install';
-			$button_args['file'] = isset( $status['file'] ) ? $status['file'] : '';
-		} elseif ( ($current_tab == 'addons' || $current_tab == 'gateways') && isset( $addon->info->id ) && $addon->info->id ) {
+			$button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
+			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
+		} elseif (($current_tab == 'addons' || $current_tab == 'gateways') && isset($addon->info->id) && $addon->info->id) {
 			include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
-			if ( ! empty( $addon->licensing->edd_slug ) ) {
-$button_args['slug'] = $addon->licensing->edd_slug;}
-			$status = self::install_plugin_install_status( $addon );
-			$button_args['file'] = isset( $status['file'] ) ? $status['file'] : '';
-			if ( isset( $status['status'] ) ) {
-$button_args['install_status'] = $status['status'];}
+			if (!empty($addon->licensing->edd_slug)) {
+$button_args['slug'] = $addon->licensing->edd_slug; }
+			$status = self::install_plugin_install_status($addon);
+			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
+			if (isset($status['status'])) {
+$button_args['install_status'] = $status['status']; }
 			$button_args['update_url'] = 'https://wpinvoicing.com';
-		} elseif ( $current_tab == 'themes' && isset( $addon->info->id ) && $addon->info->id ) {
-			if ( ! empty( $addon->licensing->edd_slug ) ) {
-$button_args['slug'] = $addon->licensing->edd_slug;}
-			$button_args['installed'] = self::is_theme_installed( $addon );
-			if ( ! in_array( $button_args['slug'], $wp_org_themes ) ) {
+		} elseif ($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
+			if (!empty($addon->licensing->edd_slug)) {
+$button_args['slug'] = $addon->licensing->edd_slug; }
+			$button_args['installed'] = self::is_theme_installed($addon);
+			if (!in_array($button_args['slug'], $wp_org_themes)) {
 				$button_args['update_url'] = 'https://wpinvoicing.com';
 			}
 		}
 
 		// set price
-		if ( isset( $addon->pricing ) && ! empty( $addon->pricing ) ) {
-			if ( is_object( $addon->pricing ) ) {
-				$prices = (array)$addon->pricing;
-				$button_args['price'] = reset( $prices );
-			} elseif ( isset( $addon->pricing ) ) {
+		if (isset($addon->pricing) && !empty($addon->pricing)) {
+			if (is_object($addon->pricing)) {
+				$prices = (array) $addon->pricing;
+				$button_args['price'] = reset($prices);
+			} elseif (isset($addon->pricing)) {
 				$button_args['price'] = $addon->pricing;
 			}
 		}
 
 		// set price text
-		if ( $button_args['price'] && $button_args['price'] != '0.00' ) {
-			$button_args['price_text'] = sprintf( __( 'From: $%d', 'invoicing' ), $button_args['price'] );
+		if ($button_args['price'] && $button_args['price'] != '0.00') {
+			$button_args['price_text'] = sprintf(__('From: $%d', 'invoicing'), $button_args['price']);
 		}
 
 		// set if installed
-		if ( in_array( $button_args['install_status'], array( 'installed', 'latest_installed', 'update_available', 'newer_installed' ) ) ) {
+		if (in_array($button_args['install_status'], array('installed', 'latest_installed', 'update_available', 'newer_installed'))) {
 			$button_args['installed'] = true;
 		}
 
 //		print_r($button_args);
 		// set if active
-		if ( $button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes') ) {
-			if ( $button_args['type'] != 'themes' ) {
-				$button_args['active'] = is_plugin_active( $button_args['file'] );
+		if ($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')) {
+			if ($button_args['type'] != 'themes') {
+				$button_args['active'] = is_plugin_active($button_args['file']);
 			} else {
-				$button_args['active'] = self::is_theme_active( $addon );
+				$button_args['active'] = self::is_theme_active($addon);
 			}
 		}
 
 		// set button text and class
-		if ( $button_args['active'] ) {
-			$button_args['button_text'] = __( 'Active', 'invoicing' );
+		if ($button_args['active']) {
+			$button_args['button_text'] = __('Active', 'invoicing');
 			$button_args['class'] = ' button-secondary disabled ';
-		} elseif ( $button_args['installed'] ) {
-			$button_args['button_text'] = __( 'Activate', 'invoicing' );
+		} elseif ($button_args['installed']) {
+			$button_args['button_text'] = __('Activate', 'invoicing');
 
-			if ( $button_args['type'] != 'themes' ) {
-				if ( current_user_can( 'manage_options' ) ) {
-					$button_args['url'] = wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=' . $button_args['file'] ), 'activate-plugin_' . $button_args['file'] );
+			if ($button_args['type'] != 'themes') {
+				if (current_user_can('manage_options')) {
+					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $button_args['file']), 'activate-plugin_' . $button_args['file']);
 				} else {
 					$button_args['url'] = '#';
 				}
 			} else {
-				if ( current_user_can( 'switch_themes' ) ) {
-					$button_args['url'] = self::get_theme_activation_url( $addon );
+				if (current_user_can('switch_themes')) {
+					$button_args['url'] = self::get_theme_activation_url($addon);
 				} else {
 					$button_args['url'] = '#';
 				}
 			}
 } else {
-			if ( $button_args['type'] == 'recommended_plugins' ) {
-				$button_args['button_text'] = __( 'Install', 'invoicing' );
+			if ($button_args['type'] == 'recommended_plugins') {
+				$button_args['button_text'] = __('Install', 'invoicing');
 					} else {
-				$button_args['button_text'] = __( 'Get it', 'invoicing' );
+				$button_args['button_text'] = __('Get it', 'invoicing');
 
 				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
 			$button_args['button_text'] = __('Install','invoicing');
@@ -229,41 +229,41 @@ 
 		}
 
 		// filter the button arguments
-		$button_args = apply_filters( 'edd_api_button_args', $button_args );
+		$button_args = apply_filters('edd_api_button_args', $button_args);
 //		print_r($button_args);
 		// set price text
-		if ( isset( $button_args['price_text'] ) ) {
+		if (isset($button_args['price_text'])) {
 			?>
 			<a
 				target="_blank"
 				class="addons-price-text"
-				href="<?php echo esc_url( $button_args['link'] ); ?>">
-				<?php echo esc_html( $button_args['price_text'] ); ?>
+				href="<?php echo esc_url($button_args['link']); ?>">
+				<?php echo esc_html($button_args['price_text']); ?>
 			</a>
 			<?php
 		}
 
 		?>
 		<a
-			data-licence="<?php echo esc_attr( $button_args['license'] ); ?>"
+			data-licence="<?php echo esc_attr($button_args['license']); ?>"
 			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0; ?>"
-			data-title="<?php echo esc_attr( $button_args['title'] ); ?>"
-			data-type="<?php echo esc_attr( $button_args['type'] ); ?>"
-			data-text-error-message="<?php esc_attr_e( 'Something went wrong!', 'invoicing' ); ?>"
-			data-text-activate="<?php esc_attr_e( 'Activate', 'invoicing' ); ?>"
-			data-text-activating="<?php esc_attr_e( 'Activating', 'invoicing' ); ?>"
-			data-text-deactivate="<?php esc_attr_e( 'Deactivate', 'invoicing' ); ?>"
-			data-text-installed="<?php esc_attr_e( 'Installed', 'invoicing' ); ?>"
-			data-text-install="<?php esc_attr_e( 'Install', 'invoicing' ); ?>"
-			data-text-installing="<?php esc_attr_e( 'Installing', 'invoicing' ); ?>"
-			data-text-error="<?php esc_attr_e( 'Error', 'invoicing' ); ?>"
+			data-title="<?php echo esc_attr($button_args['title']); ?>"
+			data-type="<?php echo esc_attr($button_args['type']); ?>"
+			data-text-error-message="<?php esc_attr_e('Something went wrong!', 'invoicing'); ?>"
+			data-text-activate="<?php esc_attr_e('Activate', 'invoicing'); ?>"
+			data-text-activating="<?php esc_attr_e('Activating', 'invoicing'); ?>"
+			data-text-deactivate="<?php esc_attr_e('Deactivate', 'invoicing'); ?>"
+			data-text-installed="<?php esc_attr_e('Installed', 'invoicing'); ?>"
+			data-text-install="<?php esc_attr_e('Install', 'invoicing'); ?>"
+			data-text-installing="<?php esc_attr_e('Installing', 'invoicing'); ?>"
+			data-text-error="<?php esc_attr_e('Error', 'invoicing'); ?>"
 			<?php
-            if ( ! empty( $button_args['onclick'] ) ) {
-echo " onclick='" . esc_attr( $button_args['onclick'] ) . "' ";}
+            if (!empty($button_args['onclick'])) {
+echo " onclick='" . esc_attr($button_args['onclick']) . "' "; }
 ?>
-			class="addons-button  <?php echo esc_attr( $button_args['class'] ); ?>"
-			href="<?php echo esc_url( $button_args['url'] ); ?>">
-			<?php echo esc_html( $button_args['button_text'] ); ?>
+			class="addons-button  <?php echo esc_attr($button_args['class']); ?>"
+			href="<?php echo esc_url($button_args['url']); ?>">
+			<?php echo esc_html($button_args['button_text']); ?>
 		</a>
 		<?php
 
@@ -277,9 +277,9 @@ 
 		$tabs            = self::get_tabs();
 		$sections        = self::get_sections();
 		$theme           = wp_get_theme();
-		$section_keys    = array_keys( $sections );
-		$current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+		$section_keys    = array_keys($sections);
+		$current_section = isset($_GET['section']) ? sanitize_text_field($_GET['section']) : current($section_keys);
+		$current_tab     = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
 		include_once WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php';
 	}
 
@@ -294,19 +294,19 @@ 
                 'slug'      => 'invoicing-quotes',
 				'name'      => 'Quotes',
 				'thumbnail' => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
-                'desc'      => __( 'Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.', 'invoicing' ),
+                'desc'      => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.', 'invoicing'),
             ),
             'geodirectory'     => array(
                 'url'  => 'https://wordpress.org/plugins/geodirectory/',
                 'slug' => 'geodirectory',
                 'name' => 'GeoDirectory',
-                'desc' => __( 'Turn any WordPress theme into a global business directory portal.', 'invoicing' ),
+                'desc' => __('Turn any WordPress theme into a global business directory portal.', 'invoicing'),
             ),
             'userswp'          => array(
                 'url'  => 'https://wordpress.org/plugins/userswp/',
                 'slug' => 'userswp',
                 'name' => 'UsersWP',
-                'desc' => __( 'Allow frontend user login and registration as well as have slick profile pages.', 'invoicing' ),
+                'desc' => __('Allow frontend user login and registration as well as have slick profile pages.', 'invoicing'),
             ),
 		);