AyeCode / invoicing

includes/payments/class-getpaid-payment-form-submission-taxes.php

Indentation +212 added lines, -212 removed lines

@@ -12,231 +12,231 @@
  */
 class GetPaid_Payment_Form_Submission_Taxes {
 
-	/**
-	 * Submission taxes.
-	 * @var array
-	 */
-	public $taxes = array();
-
-	/**
-	 * Initial tax.
-	 * @var float
-	 */
-	protected $initial_tax = 0;
-
-	/**
-	 * Recurring tax.
-	 * @var float
-	 */
-	protected $recurring_tax = 0;
+    /**
+     * Submission taxes.
+     * @var array
+     */
+    public $taxes = array();
+
+    /**
+     * Initial tax.
+     * @var float
+     */
+    protected $initial_tax = 0;
+
+    /**
+     * Recurring tax.
+     * @var float
+     */
+    protected $recurring_tax = 0;
+
+    /**
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        // Validate VAT number.
+        $this->validate_vat( $submission );
+
+        foreach ( $submission->get_items() as $item ) {
+            $this->process_item_tax( $item, $submission );
+        }
+
+        // Process any existing invoice taxes.
+        if ( $submission->has_invoice() ) {
+            $this->taxes = $submission->get_invoice()->get_taxes();
+        }
+
+        // Add VAT.
+        $this->taxes['vat'] = array(
+            'name'          => 'vat',
+            'initial_tax'   => $this->initial_tax,
+            'recurring_tax' => $this->recurring_tax,
+        );
+
+    }
+
+    /**
+     * Maybe process tax.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function process_item_tax( $item, $submission ) {
+
+        $rate     = wpinv_get_tax_rate( $submission->country, $submission->state, $item->get_id() );
+        $price    = $item->get_sub_total();
+        $item_tax = $price * $rate * 0.01;
+
+        if ( wpinv_prices_include_tax() ) {
+            $item_tax = $price - ( $price - $price * $rate * 0.01 );
+        }
+
+        $this->initial_tax += $item_tax;
+
+        if ( $item->is_recurring() ) {
+            $this->recurring_tax += $item_tax;
+        }
+
+    }
+
+    /**
+     * Checks if the submission has a digital item.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_digital_item( $submission ) {
+
+        foreach ( $submission->get_items() as $item ) {
+
+            if ( 'digital' == $item->get_vat_rule() ) {
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks if this is an eu store.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_eu_store() {
+        return $this->is_eu_country( wpinv_get_default_country() );
+    }
+
+    /**
+     * Checks if this is an eu country.
+     *
+     * @param string $country
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_eu_country( $country ) {
+        return getpaid_is_eu_state( $country ) || getpaid_is_gst_country( $country );
+    }
+
+    /**
+     * Checks if this is an eu purchase.
+     *
+     * @param string $customer_country
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_eu_transaction( $customer_country ) {
+        return $this->is_eu_country( $customer_country ) && $this->is_eu_store();
+    }
+
+    /**
+     * Retrieves the vat number.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_vat_number( $submission ) {
+
+        // Retrieve from the posted number.
+        $vat_number = $submission->get_field( 'wpinv_vat_number' );
+        if ( ! empty( $vat_number ) ) {
+            return wpinv_clean( $vat_number );
+        }
+
+        // Retrieve from the invoice.
+        return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
+    }
+
+    /**
+     * Retrieves the company.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_company( $submission ) {
+
+        // Retrieve from the posted data.
+        $company = $submission->get_field( 'wpinv_company' );
+        if ( ! empty( $company ) ) {
+            return wpinv_clean( $company );
+        }
+
+        // Retrieve from the invoice.
+        return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
+    }
+
+    /**
+     * Checks if we requires a VAT number.
+     *
+     * @param bool $ip_in_eu Whether the customer IP is from the EU
+     * @param bool $country_in_eu Whether the customer country is from the EU
+     * @since 1.0.19
+     * @return string
+     */
+    public function requires_vat( $ip_in_eu, $country_in_eu ) {
+
+        $prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
+        $prevent_b2c = ! empty( $prevent_b2c );
+        $is_eu       = $ip_in_eu || $country_in_eu;
+
+        return $prevent_b2c && $is_eu;
+    }
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		// Validate VAT number.
-		$this->validate_vat( $submission );
-
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
-		}
-
-		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = $submission->get_invoice()->get_taxes();
-		}
-
-		// Add VAT.
-		$this->taxes['vat'] = array(
-			'name'          => 'vat',
-			'initial_tax'   => $this->initial_tax,
-			'recurring_tax' => $this->recurring_tax,
-		);
-
-	}
-
-	/**
-	 * Maybe process tax.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function process_item_tax( $item, $submission ) {
-
-		$rate     = wpinv_get_tax_rate( $submission->country, $submission->state, $item->get_id() );
-		$price    = $item->get_sub_total();
-		$item_tax = $price * $rate * 0.01;
-
-		if ( wpinv_prices_include_tax() ) {
-			$item_tax = $price - ( $price - $price * $rate * 0.01 );
-		}
-
-		$this->initial_tax += $item_tax;
-
-		if ( $item->is_recurring() ) {
-			$this->recurring_tax += $item_tax;
-		}
-
-	}
-
-	/**
-	 * Checks if the submission has a digital item.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_digital_item( $submission ) {
-
-		foreach ( $submission->get_items() as $item ) {
-
-			if ( 'digital' == $item->get_vat_rule() ) {
-				return true;
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if this is an eu store.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_eu_store() {
-		return $this->is_eu_country( wpinv_get_default_country() );
-	}
-
-	/**
-	 * Checks if this is an eu country.
-	 *
-	 * @param string $country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country ) || getpaid_is_gst_country( $country );
-	}
-
-	/**
-	 * Checks if this is an eu purchase.
-	 *
-	 * @param string $customer_country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_eu_transaction( $customer_country ) {
-		return $this->is_eu_country( $customer_country ) && $this->is_eu_store();
-	}
-
-	/**
-	 * Retrieves the vat number.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_vat_number( $submission ) {
-
-		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number' );
-		if ( ! empty( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
-		}
-
-		// Retrieve from the invoice.
-		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
-	}
-
-	/**
-	 * Retrieves the company.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_company( $submission ) {
-
-		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
-		}
-
-		// Retrieve from the invoice.
-		return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
-	}
-
-	/**
-	 * Checks if we requires a VAT number.
-	 *
-	 * @param bool $ip_in_eu Whether the customer IP is from the EU
-	 * @param bool $country_in_eu Whether the customer country is from the EU
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
-
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
-		$is_eu       = $ip_in_eu || $country_in_eu;
-
-		return $prevent_b2c && $is_eu;
-	}
-
-	/**
-	 * Validate VAT data.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 */
-	public function validate_vat( $submission ) {
-
-		$has_digital = $this->has_digital_item( $submission );
-		$in_eu       = $this->is_eu_transaction( $submission->country );
-
-		// Abort if we are not validating vat numbers.
-		if ( ! $has_digital && ! $in_eu ) {
+     * Validate VAT data.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     */
+    public function validate_vat( $submission ) {
+
+        $has_digital = $this->has_digital_item( $submission );
+        $in_eu       = $this->is_eu_transaction( $submission->country );
+
+        // Abort if we are not validating vat numbers.
+        if ( ! $has_digital && ! $in_eu ) {
             return;
-		}
+        }
 
-		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
-		$company     = $this->get_company( $submission );
-		$ip_country  = WPInv_EUVat::get_country_by_ip();
+        // Prepare variables.
+        $vat_number  = $this->get_vat_number( $submission );
+        $company     = $this->get_company( $submission );
+        $ip_country  = WPInv_EUVat::get_country_by_ip();
         $is_eu       = $this->is_eu_country( $submission->country );
         $is_ip_eu    = $this->is_eu_country( $ip_country );
 
-		// If we're preventing business to consumer purchases, ensure
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+        // If we're preventing business to consumer purchases, ensure
+        if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
 
-			// Ensure that a vat number has been specified.
-			throw new Exception(
-				wp_sprintf(
-					__( 'Please enter your %s number to verify your purchase is by an EU business.', 'invoicing' ),
-					getpaid_vat_name()
-				)
-			);
+            // Ensure that a vat number has been specified.
+            throw new Exception(
+                wp_sprintf(
+                    __( 'Please enter your %s number to verify your purchase is by an EU business.', 'invoicing' ),
+                    getpaid_vat_name()
+                )
+            );
 
-		}
+        }
 
-		// Abort if we are not validating vat (vat number should exist, user should be in eu and business too).
-		if ( ! $is_eu || ! $in_eu || empty( $vat_number ) ) {
+        // Abort if we are not validating vat (vat number should exist, user should be in eu and business too).
+        if ( ! $is_eu || ! $in_eu || empty( $vat_number ) ) {
             return;
-		}
+        }
 
-		$is_valid = WPInv_EUVat::validate_vat_number( $vat_number, $company, $submission->country );
+        $is_valid = WPInv_EUVat::validate_vat_number( $vat_number, $company, $submission->country );
 
-		if ( is_string( $is_valid ) ) {
-			throw new Exception( $is_valid );
-		}
+        if ( is_string( $is_valid ) ) {
+            throw new Exception( $is_valid );
+        }
 
-	}
+    }
 
 }

Spacing +44 added lines, -44 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission taxes class
@@ -35,17 +35,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Validate VAT number.
-		$this->validate_vat( $submission );
+		$this->validate_vat($submission);
 
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
+		foreach ($submission->get_items() as $item) {
+			$this->process_item_tax($item, $submission);
 		}
 
 		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$this->taxes = $submission->get_invoice()->get_taxes();
 		}
 
@@ -65,19 +65,19 @@ 
 	 * @param GetPaid_Form_Item $item
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_item_tax( $item, $submission ) {
+	public function process_item_tax($item, $submission) {
 
-		$rate     = wpinv_get_tax_rate( $submission->country, $submission->state, $item->get_id() );
+		$rate     = wpinv_get_tax_rate($submission->country, $submission->state, $item->get_id());
 		$price    = $item->get_sub_total();
 		$item_tax = $price * $rate * 0.01;
 
-		if ( wpinv_prices_include_tax() ) {
-			$item_tax = $price - ( $price - $price * $rate * 0.01 );
+		if (wpinv_prices_include_tax()) {
+			$item_tax = $price - ($price - $price * $rate * 0.01);
 		}
 
 		$this->initial_tax += $item_tax;
 
-		if ( $item->is_recurring() ) {
+		if ($item->is_recurring()) {
 			$this->recurring_tax += $item_tax;
 		}
 
@@ -90,11 +90,11 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function has_digital_item( $submission ) {
+	public function has_digital_item($submission) {
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 
-			if ( 'digital' == $item->get_vat_rule() ) {
+			if ('digital' == $item->get_vat_rule()) {
 				return true;
 			}
 
@@ -110,7 +110,7 @@ 
 	 * @return bool
 	 */
 	public function is_eu_store() {
-		return $this->is_eu_country( wpinv_get_default_country() );
+		return $this->is_eu_country(wpinv_get_default_country());
 	}
 
 	/**
@@ -120,8 +120,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country ) || getpaid_is_gst_country( $country );
+	public function is_eu_country($country) {
+		return getpaid_is_eu_state($country) || getpaid_is_gst_country($country);
 	}
 
 	/**
@@ -131,8 +131,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function is_eu_transaction( $customer_country ) {
-		return $this->is_eu_country( $customer_country ) && $this->is_eu_store();
+	public function is_eu_transaction($customer_country) {
+		return $this->is_eu_country($customer_country) && $this->is_eu_store();
 	}
 
 	/**
@@ -142,12 +142,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_vat_number( $submission ) {
+	public function get_vat_number($submission) {
 
 		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number' );
-		if ( ! empty( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
+		$vat_number = $submission->get_field('wpinv_vat_number');
+		if (!empty($vat_number)) {
+			return wpinv_clean($vat_number);
 		}
 
 		// Retrieve from the invoice.
@@ -161,12 +161,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_company( $submission ) {
+	public function get_company($submission) {
 
 		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
+		$company = $submission->get_field('wpinv_company');
+		if (!empty($company)) {
+			return wpinv_clean($company);
 		}
 
 		// Retrieve from the invoice.
@@ -181,10 +181,10 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
+	public function requires_vat($ip_in_eu, $country_in_eu) {
 
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
+		$prevent_b2c = wpinv_get_option('vat_prevent_b2c_purchase');
+		$prevent_b2c = !empty($prevent_b2c);
 		$is_eu       = $ip_in_eu || $country_in_eu;
 
 		return $prevent_b2c && $is_eu;
@@ -196,30 +196,30 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @since 1.0.19
 	 */
-	public function validate_vat( $submission ) {
+	public function validate_vat($submission) {
 
-		$has_digital = $this->has_digital_item( $submission );
-		$in_eu       = $this->is_eu_transaction( $submission->country );
+		$has_digital = $this->has_digital_item($submission);
+		$in_eu       = $this->is_eu_transaction($submission->country);
 
 		// Abort if we are not validating vat numbers.
-		if ( ! $has_digital && ! $in_eu ) {
+		if (!$has_digital && !$in_eu) {
             return;
 		}
 
 		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
-		$company     = $this->get_company( $submission );
+		$vat_number  = $this->get_vat_number($submission);
+		$company     = $this->get_company($submission);
 		$ip_country  = WPInv_EUVat::get_country_by_ip();
-        $is_eu       = $this->is_eu_country( $submission->country );
-        $is_ip_eu    = $this->is_eu_country( $ip_country );
+        $is_eu       = $this->is_eu_country($submission->country);
+        $is_ip_eu    = $this->is_eu_country($ip_country);
 
 		// If we're preventing business to consumer purchases, ensure
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+		if ($this->requires_vat($is_ip_eu, $is_eu) && empty($vat_number)) {
 
 			// Ensure that a vat number has been specified.
 			throw new Exception(
 				wp_sprintf(
-					__( 'Please enter your %s number to verify your purchase is by an EU business.', 'invoicing' ),
+					__('Please enter your %s number to verify your purchase is by an EU business.', 'invoicing'),
 					getpaid_vat_name()
 				)
 			);
@@ -227,14 +227,14 @@ 
 		}
 
 		// Abort if we are not validating vat (vat number should exist, user should be in eu and business too).
-		if ( ! $is_eu || ! $in_eu || empty( $vat_number ) ) {
+		if (!$is_eu || !$in_eu || empty($vat_number)) {
             return;
 		}
 
-		$is_valid = WPInv_EUVat::validate_vat_number( $vat_number, $company, $submission->country );
+		$is_valid = WPInv_EUVat::validate_vat_number($vat_number, $company, $submission->country);
 
-		if ( is_string( $is_valid ) ) {
-			throw new Exception( $is_valid );
+		if (is_string($is_valid)) {
+			throw new Exception($is_valid);
 		}
 
 	}

includes/payments/class-getpaid-payment-form-submission-items.php

Indentation +54 added lines, -54 removed lines

@@ -12,77 +12,77 @@
  */
 class GetPaid_Payment_Form_Submission_Items {
 
-	/**
-	 * Submission items.
-	 * @var GetPaid_Form_Item[]
-	 */
-	public $items = array();
+    /**
+     * Submission items.
+     * @var GetPaid_Form_Item[]
+     */
+    public $items = array();
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
 
-		$data         = $submission->get_data();
-		$payment_form = $submission->get_payment_form();
+        $data         = $submission->get_data();
+        $payment_form = $submission->get_payment_form();
 
-		// Prepare the selected items.
-		$selected_items = array();
-		if ( ! empty( $data['getpaid-items'] ) ) {
-			$selected_items = wpinv_clean( $data['getpaid-items'] );
-		}
+        // Prepare the selected items.
+        $selected_items = array();
+        if ( ! empty( $data['getpaid-items'] ) ) {
+            $selected_items = wpinv_clean( $data['getpaid-items'] );
+        }
 
-		// For default forms, ensure that an item has been set.
-		if ( $payment_form->is_default() && ! $submission->has_invoice() ) {
-			$payment_form->set_items( $selected_items );
-		}
+        // For default forms, ensure that an item has been set.
+        if ( $payment_form->is_default() && ! $submission->has_invoice() ) {
+            $payment_form->set_items( $selected_items );
+        }
 
-		// Process each individual item.
-		foreach ( $payment_form->get_items() as $item ) {
-			$this->process_item( $item, $selected_items );
-		}
+        // Process each individual item.
+        foreach ( $payment_form->get_items() as $item ) {
+            $this->process_item( $item, $selected_items );
+        }
 
-	}
+    }
 
-	/**
-	 * Process a single item.
-	 *
-	 * @param GetPaid_Form_Item $item
-	 * @param array $selected_items
-	 */
-	public function process_item( $item, $selected_items ) {
+    /**
+     * Process a single item.
+     *
+     * @param GetPaid_Form_Item $item
+     * @param array $selected_items
+     */
+    public function process_item( $item, $selected_items ) {
 
-		// Abort if this is an optional item and it has not been selected.
-		if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
-			return;
-		}
+        // Abort if this is an optional item and it has not been selected.
+        if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
+            return;
+        }
 
-		// (maybe) let customers change the quantities and prices.
-		if ( isset( $selected_items[ $item->get_id() ] ) ) {
+        // (maybe) let customers change the quantities and prices.
+        if ( isset( $selected_items[ $item->get_id() ] ) ) {
 
-			// Maybe change the quantities.
-			if ( $item->allows_quantities() ) {
-				$item->set_quantity( (int) $selected_items[ $item->get_id() ]['quantity'] );
-			}
+            // Maybe change the quantities.
+            if ( $item->allows_quantities() ) {
+                $item->set_quantity( (int) $selected_items[ $item->get_id() ]['quantity'] );
+            }
 
-			// Maybe change the price.
-			if ( $item->user_can_set_their_price() ) {
-				$price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
+            // Maybe change the price.
+            if ( $item->user_can_set_their_price() ) {
+                $price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
 
-				// But don't get lower than the minimum price.
-				$price = max( $price, $item->get_minimum_price() );
+                // But don't get lower than the minimum price.
+                $price = max( $price, $item->get_minimum_price() );
 
-				$item->set_price( $price );
+                $item->set_price( $price );
 
-			}
+            }
 
-		}
+        }
 
-		// Save the item.
-		$this->items[] = $item;
+        // Save the item.
+        $this->items[] = $item;
 
-	}
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission itemss class
@@ -23,25 +23,25 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		$data         = $submission->get_data();
 		$payment_form = $submission->get_payment_form();
 
 		// Prepare the selected items.
 		$selected_items = array();
-		if ( ! empty( $data['getpaid-items'] ) ) {
-			$selected_items = wpinv_clean( $data['getpaid-items'] );
+		if (!empty($data['getpaid-items'])) {
+			$selected_items = wpinv_clean($data['getpaid-items']);
 		}
 
 		// For default forms, ensure that an item has been set.
-		if ( $payment_form->is_default() && ! $submission->has_invoice() ) {
-			$payment_form->set_items( $selected_items );
+		if ($payment_form->is_default() && !$submission->has_invoice()) {
+			$payment_form->set_items($selected_items);
 		}
 
 		// Process each individual item.
-		foreach ( $payment_form->get_items() as $item ) {
-			$this->process_item( $item, $selected_items );
+		foreach ($payment_form->get_items() as $item) {
+			$this->process_item($item, $selected_items);
 		}
 
 	}
@@ -52,29 +52,29 @@ 
 	 * @param GetPaid_Form_Item $item
 	 * @param array $selected_items
 	 */
-	public function process_item( $item, $selected_items ) {
+	public function process_item($item, $selected_items) {
 
 		// Abort if this is an optional item and it has not been selected.
-		if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
+		if (!$item->is_required() && !isset($selected_items[$item->get_id()])) {
 			return;
 		}
 
 		// (maybe) let customers change the quantities and prices.
-		if ( isset( $selected_items[ $item->get_id() ] ) ) {
+		if (isset($selected_items[$item->get_id()])) {
 
 			// Maybe change the quantities.
-			if ( $item->allows_quantities() ) {
-				$item->set_quantity( (int) $selected_items[ $item->get_id() ]['quantity'] );
+			if ($item->allows_quantities()) {
+				$item->set_quantity((int) $selected_items[$item->get_id()]['quantity']);
 			}
 
 			// Maybe change the price.
-			if ( $item->user_can_set_their_price() ) {
-				$price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
+			if ($item->user_can_set_their_price()) {
+				$price = (float) wpinv_sanitize_amount($selected_items[$item->get_id()]['price']);
 
 				// But don't get lower than the minimum price.
-				$price = max( $price, $item->get_minimum_price() );
+				$price = max($price, $item->get_minimum_price());
 
-				$item->set_price( $price );
+				$item->set_price($price);
 
 			}
 

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

Indentation +520 added lines, -520 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,55 +10,55 @@ 
 class GetPaid_Payment_Form extends GetPaid_Data {
 
     /**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
+     * Which data store to load.
+     *
+     * @var string
+     */
     protected $data_store_name = 'payment_form';
 
     /**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'payment_form';
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'payment_form';
 
     /**
-	 * Form Data array. This is the core form data exposed in APIs.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array(
-		'status'               => 'draft',
-		'version'              => '',
-		'date_created'         => null,
+     * Form Data array. This is the core form data exposed in APIs.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array(
+        'status'               => 'draft',
+        'version'              => '',
+        'date_created'         => null,
         'date_modified'        => null,
         'name'                 => '',
         'author'               => 1,
         'elements'             => null,
-		'items'                => null,
-		'earned'               => 0,
-		'refunded'             => 0,
-		'cancelled'            => 0,
-		'failed'               => 0,
-	);
-
-    /**
-	 * Stores meta in cache for future reads.
-	 *
-	 * A group must be set to to enable caching.
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'getpaid_forms';
-
-	/**
-	 * Stores a reference to the invoice if the form is for an invoice..
-	 *
-	 * @var WPInv_Invoice
-	 */
-	public $invoice = 0;
+        'items'                => null,
+        'earned'               => 0,
+        'refunded'             => 0,
+        'cancelled'            => 0,
+        'failed'               => 0,
+    );
+
+    /**
+     * Stores meta in cache for future reads.
+     *
+     * A group must be set to to enable caching.
+     *
+     * @var string
+     */
+    protected $cache_group = 'getpaid_forms';
+
+    /**
+     * Stores a reference to the invoice if the form is for an invoice..
+     *
+     * @var WPInv_Invoice
+     */
+    public $invoice = 0;
 
     /**
      * Stores a reference to the original WP_Post object
@@ -68,35 +68,35 @@ 
     protected $post = null;
 
     /**
-	 * Get the form if ID is passed, otherwise the form is new and empty.
-	 *
-	 * @param  int|object|GetPaid_Payment_Form|WP_Post $form Form to read.
-	 */
-	public function __construct( $form = 0 ) {
-		parent::__construct( $form );
+     * Get the form if ID is passed, otherwise the form is new and empty.
+     *
+     * @param  int|object|GetPaid_Payment_Form|WP_Post $form Form to read.
+     */
+    public function __construct( $form = 0 ) {
+        parent::__construct( $form );
 
-		if ( is_numeric( $form ) && $form > 0 ) {
-			$this->set_id( $form );
-		} elseif ( $form instanceof self ) {
+        if ( is_numeric( $form ) && $form > 0 ) {
+            $this->set_id( $form );
+        } elseif ( $form instanceof self ) {
 
-			$this->set_id( $form->get_id() );
-			$this->invoice = $form->invoice;
+            $this->set_id( $form->get_id() );
+            $this->invoice = $form->invoice;
 
-		} elseif ( ! empty( $form->ID ) ) {
-			$this->set_id( $form->ID );
-		} else {
-			$this->set_object_read( true );
-		}
+        } elseif ( ! empty( $form->ID ) ) {
+            $this->set_id( $form->ID );
+        } else {
+            $this->set_object_read( true );
+        }
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+        $this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
 
-		if ( $this->get_id() > 0 ) {
+        if ( $this->get_id() > 0 ) {
             $this->post = get_post( $this->get_id() );
-			$this->data_store->read( $this );
+            $this->data_store->read( $this );
         }
 
-	}
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -114,351 +114,351 @@ 
     */
 
     /**
-	 * Get plugin version when the form was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+     * Get plugin version when the form was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_version( $context = 'view' ) {
+        return $this->get_prop( 'version', $context );
     }
 
     /**
-	 * Get date when the form was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+     * Get date when the form was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created( $context = 'view' ) {
+        return $this->get_prop( 'date_created', $context );
     }
 
     /**
-	 * Get GMT date when the form was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created_gmt( $context = 'view' ) {
+     * Get GMT date when the form was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created_gmt( $context = 'view' ) {
         $date = $this->get_date_created( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get date when the form was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+     * Get date when the form was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified( $context = 'view' ) {
+        return $this->get_prop( 'date_modified', $context );
     }
 
     /**
-	 * Get GMT date when the form was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
+     * Get GMT date when the form was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified_gmt( $context = 'view' ) {
         $date = $this->get_date_modified( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get the form name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_name( $context = 'view' ) {
-		return $this->get_prop( 'name', $context );
+     * Get the form name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_name( $context = 'view' ) {
+        return $this->get_prop( 'name', $context );
     }
 
     /**
-	 * Alias of self::get_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
-	}
+     * Alias of self::get_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_title( $context = 'view' ) {
+        return $this->get_name( $context );
+    }
 
     /**
-	 * Get the owner of the form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+     * Get the owner of the form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_author( $context = 'view' ) {
+        return (int) $this->get_prop( 'author', $context );
     }
 
     /**
-	 * Get the elements that make up the form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_elements( $context = 'view' ) {
-		$elements = $this->get_prop( 'elements', $context );
+     * Get the elements that make up the form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_elements( $context = 'view' ) {
+        $elements = $this->get_prop( 'elements', $context );
 
-		if ( empty( $elements ) || ! is_array( $elements ) ) {
+        if ( empty( $elements ) || ! is_array( $elements ) ) {
             return wpinv_get_data( 'sample-payment-form' );
-		}
+        }
 
-		// Ensure that all required elements exist.
-		$_elements = array();
-		foreach ( $elements as $element ) {
+        // Ensure that all required elements exist.
+        $_elements = array();
+        foreach ( $elements as $element ) {
 
-			if ( $element['type'] == 'pay_button' && ! $this->has_element_type( 'gateway_select' ) ) {
+            if ( $element['type'] == 'pay_button' && ! $this->has_element_type( 'gateway_select' ) ) {
 
-				$_elements[] = array(
-					'text'        => __( 'Select Payment Method', 'invoicing' ),
-					'id'          => 'gtscicd',
-					'name'        => 'gtscicd',
-					'type'        => 'gateway_select',
-					'premade'     => true
+                $_elements[] = array(
+                    'text'        => __( 'Select Payment Method', 'invoicing' ),
+                    'id'          => 'gtscicd',
+                    'name'        => 'gtscicd',
+                    'type'        => 'gateway_select',
+                    'premade'     => true
 			
-				);
+                );
 
-			}
+            }
 
-			$_elements[] = $element;
+            $_elements[] = $element;
 
-		}
+        }
 
         return $_elements;
-	}
-
-	/**
-	 * Get the items sold via the form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @param  string $return objects or arrays.
-	 * @return GetPaid_Form_Item[]
-	 */
-	public function get_items( $context = 'view', $return = 'objects' ) {
-		$items = $this->get_prop( 'items', $context );
-
-		if ( empty( $items ) || ! is_array( $items ) ) {
+    }
+
+    /**
+     * Get the items sold via the form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @param  string $return objects or arrays.
+     * @return GetPaid_Form_Item[]
+     */
+    public function get_items( $context = 'view', $return = 'objects' ) {
+        $items = $this->get_prop( 'items', $context );
+
+        if ( empty( $items ) || ! is_array( $items ) ) {
             $items = wpinv_get_data( 'sample-payment-form-items' );
-		}
+        }
+
+        // Convert the items.
+        $prepared = array();
 
-		// Convert the items.
-		$prepared = array();
+        foreach ( $items as $key => $value ) {
 
-		foreach ( $items as $key => $value ) {
+            // Form items.
+            if ( $value instanceof GetPaid_Form_Item ) {
 
-			// Form items.
-			if ( $value instanceof GetPaid_Form_Item ) {
+                if ( $value->can_purchase() ) {
+                    $prepared[] = $value;
+                }
 
-				if ( $value->can_purchase() ) {
-					$prepared[] = $value;
-				}
+                continue;
 
-				continue;
+            }
 
-			}
+            // $item_id => $quantity (buy buttons)
+            if ( is_numeric( $key ) && is_numeric( $value ) ) {
+                $item = new GetPaid_Form_Item( $key );
 
-			// $item_id => $quantity (buy buttons)
-			if ( is_numeric( $key ) && is_numeric( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+                if ( $item->can_purchase() ) {
+                    $item->set_quantity( $value );
+                    $prepared[] = $item;
+                }
 
-				if ( $item->can_purchase() ) {
-					$item->set_quantity( $value );
-					$prepared[] = $item;
-				}
+                continue;
+            }
 
-				continue;
-			}
+            // Items saved via payment forms editor.
+            if ( is_array( $value ) && isset( $value['id'] ) ) {
 
-			// Items saved via payment forms editor.
-			if ( is_array( $value ) && isset( $value['id'] ) ) {
+                $item = new GetPaid_Form_Item( $value['id'] );
 
-				$item = new GetPaid_Form_Item( $value['id'] );
+                if ( ! $item->can_purchase() ) {
+                    continue;
+                }
 
-				if ( ! $item->can_purchase() ) {
-					continue;
-				}
+                // Sub-total (Cart items).
+                if ( isset( $value['subtotal'] ) ) {
+                    $item->set_price( $value['subtotal'] );
+                }
 
-				// Sub-total (Cart items).
-				if ( isset( $value['subtotal'] ) ) {
-					$item->set_price( $value['subtotal'] );
-				}
+                if ( isset( $value['quantity'] ) ) {
+                    $item->set_quantity( $value['quantity'] );
+                }
 
-				if ( isset( $value['quantity'] ) ) {
-					$item->set_quantity( $value['quantity'] );
-				}
+                if ( isset( $value['allow_quantities'] ) ) {
+                    $item->set_allow_quantities( $value['allow_quantities'] );
+                }
 
-				if ( isset( $value['allow_quantities'] ) ) {
-					$item->set_allow_quantities( $value['allow_quantities'] );
-				}
+                if ( isset( $value['required'] ) ) {
+                    $item->set_is_required( $value['required'] );
+                }
 
-				if ( isset( $value['required'] ) ) {
-					$item->set_is_required( $value['required'] );
-				}
+                if ( isset( $value['description'] ) ) {
+                    $item->set_custom_description( $value['description'] );
+                }
 
-				if ( isset( $value['description'] ) ) {
-					$item->set_custom_description( $value['description'] );
-				}
+                $prepared[] = $item;
+                continue;
 
-				$prepared[] = $item;
-				continue;
+            }
+
+            // $item_id => array( 'price' => 10 ) (item variations)
+            if ( is_numeric( $key ) && is_array( $value ) ) {
+                $item = new GetPaid_Form_Item( $key );
+
+                if ( isset( $value['price'] ) && $item->user_can_set_their_price() ) {
+                    $item->set_price( $value['price'] );
+                }
+
+                if ( $item->can_purchase() ) {
+                    $prepared[] = $item;
+                }
+
+                continue;
+            }
+
+        }
+
+        if ( 'objects' == $return && 'view' == $context ) {
+            return $prepared;
+        }
+
+        $items = array();
+        foreach ( $prepared as $item ) {
+            $items[] = $item->prepare_data_for_use();
+        }
+
+        return $items;
+    }
+
+    /**
+     * Get a single item belonging to the form.
+     *
+     * @since 1.0.19
+     * @param  int $item_id The item id to return.
+     * @return GetPaid_Form_Item|bool
+     */
+    public function get_item( $item_id ) {
+
+        if ( empty( $item_id ) || ! is_numeric( $item_id ) ) {
+            return false;
+        }
+
+        foreach( $this->get_items() as $item ) {
+            if ( $item->get_id() == (int) $item_id ) {
+                return $item;
+            }
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Gets a single element.
+     *
+     * @since 1.0.19
+     * @param  string $element_type The element type to return.
+     * @return array|bool
+     */
+    public function get_element_type( $element_type ) {
+
+        if ( empty( $element_type ) || ! is_scalar( $element_type ) ) {
+            return false;
+        }
+
+        foreach ( $this->get_prop( 'elements' ) as $element ) {
+
+            if ( $element['type'] == $element_type ) {
+                return $element;
+            }
+
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Get the total amount earned via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_earned( $context = 'view' ) {
+        return $this->get_prop( 'earned', $context );
+    }
+
+    /**
+     * Get the total amount refunded via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_refunded( $context = 'view' ) {
+        return $this->get_prop( 'refunded', $context );
+    }
 
-			}
+    /**
+     * Get the total amount cancelled via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_cancelled( $context = 'view' ) {
+        return $this->get_prop( 'cancelled', $context );
+    }
 
-			// $item_id => array( 'price' => 10 ) (item variations)
-			if ( is_numeric( $key ) && is_array( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+    /**
+     * Get the total amount failed via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_failed( $context = 'view' ) {
+        return $this->get_prop( 'failed', $context );
+    }
 
-				if ( isset( $value['price'] ) && $item->user_can_set_their_price() ) {
-					$item->set_price( $value['price'] );
-				}
-
-				if ( $item->can_purchase() ) {
-					$prepared[] = $item;
-				}
-
-				continue;
-			}
-
-		}
-
-		if ( 'objects' == $return && 'view' == $context ) {
-			return $prepared;
-		}
-
-		$items = array();
-		foreach ( $prepared as $item ) {
-			$items[] = $item->prepare_data_for_use();
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Get a single item belonging to the form.
-	 *
-	 * @since 1.0.19
-	 * @param  int $item_id The item id to return.
-	 * @return GetPaid_Form_Item|bool
-	 */
-	public function get_item( $item_id ) {
-
-		if ( empty( $item_id ) || ! is_numeric( $item_id ) ) {
-			return false;
-		}
-
-		foreach( $this->get_items() as $item ) {
-			if ( $item->get_id() == (int) $item_id ) {
-				return $item;
-			}
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Gets a single element.
-	 *
-	 * @since 1.0.19
-	 * @param  string $element_type The element type to return.
-	 * @return array|bool
-	 */
-	public function get_element_type( $element_type ) {
-
-		if ( empty( $element_type ) || ! is_scalar( $element_type ) ) {
-			return false;
-		}
-
-		foreach ( $this->get_prop( 'elements' ) as $element ) {
-
-			if ( $element['type'] == $element_type ) {
-				return $element;
-			}
-
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Get the total amount earned via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_earned( $context = 'view' ) {
-		return $this->get_prop( 'earned', $context );
-	}
-
-	/**
-	 * Get the total amount refunded via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_refunded( $context = 'view' ) {
-		return $this->get_prop( 'refunded', $context );
-	}
-
-	/**
-	 * Get the total amount cancelled via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_cancelled( $context = 'view' ) {
-		return $this->get_prop( 'cancelled', $context );
-	}
-
-	/**
-	 * Get the total amount failed via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_failed( $context = 'view' ) {
-		return $this->get_prop( 'failed', $context );
-	}
-
-	/**
-	 * Get the currency.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_currency() {
-		$currency = empty( $this->invoice ) ? wpinv_get_currency() : $this->invoice->get_currency();
-		return apply_filters( 'getpaid-payment-form-currency', $currency, $this );
-	}
+    /**
+     * Get the currency.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_currency() {
+        $currency = empty( $this->invoice ) ? wpinv_get_currency() : $this->invoice->get_currency();
+        return apply_filters( 'getpaid-payment-form-currency', $currency, $this );
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -471,22 +471,22 @@ 
     */
 
     /**
-	 * Set plugin version when the item was created.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+     * Set plugin version when the item was created.
+     *
+     * @since 1.0.19
+     */
+    public function set_version( $value ) {
+        $this->set_prop( 'version', $value );
     }
 
     /**
-	 * Set date when the item was created.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the item was created.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_created( $value ) {
+     */
+    public function set_date_created( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -499,13 +499,13 @@ 
     }
 
     /**
-	 * Set date when the item was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the item was last modified.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_modified( $value ) {
+     */
+    public function set_date_modified( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -518,118 +518,118 @@ 
     }
 
     /**
-	 * Set the item name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_name( $value ) {
-		$this->set_prop( 'name', sanitize_text_field( $value ) );
-    }
-
-    /**
-	 * Alias of self::set_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
-    }
-
-    /**
-	 * Set the owner of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value New author.
-	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
-	}
-
-	/**
-	 * Set the form elements.
-	 *
-	 * @since 1.0.19
-	 * @param  array $value Form elements.
-	 */
-	public function set_elements( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'elements', $value );
-		}
-	}
-
-	/**
-	 * Set the form items.
-	 *
-	 * @since 1.0.19
-	 * @param  array $value Form elements.
-	 */
-	public function set_items( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'items', $value );
-		}
-	}
-
-	/**
-	 * Set the total amount earned via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount earned.
-	 */
-	public function set_earned( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'earned', $value );
-	}
-
-	/**
-	 * Set the total amount refunded via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount refunded.
-	 */
-	public function set_refunded( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'refunded', $value );
-	}
-
-	/**
-	 * Set the total amount cancelled via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount cancelled.
-	 */
-	public function set_cancelled( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'cancelled', $value );
-	}
-
-	/**
-	 * Set the total amount failed via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount cancelled.
-	 */
-	public function set_failed( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'failed', $value );
-	}
+     * Set the item name.
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_name( $value ) {
+        $this->set_prop( 'name', sanitize_text_field( $value ) );
+    }
+
+    /**
+     * Alias of self::set_name().
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_title( $value ) {
+        $this->set_name( $value );
+    }
+
+    /**
+     * Set the owner of the item.
+     *
+     * @since 1.0.19
+     * @param  int $value New author.
+     */
+    public function set_author( $value ) {
+        $this->set_prop( 'author', (int) $value );
+    }
+
+    /**
+     * Set the form elements.
+     *
+     * @since 1.0.19
+     * @param  array $value Form elements.
+     */
+    public function set_elements( $value ) {
+        if ( is_array( $value ) ) {
+            $this->set_prop( 'elements', $value );
+        }
+    }
+
+    /**
+     * Set the form items.
+     *
+     * @since 1.0.19
+     * @param  array $value Form elements.
+     */
+    public function set_items( $value ) {
+        if ( is_array( $value ) ) {
+            $this->set_prop( 'items', $value );
+        }
+    }
+
+    /**
+     * Set the total amount earned via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount earned.
+     */
+    public function set_earned( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'earned', $value );
+    }
+
+    /**
+     * Set the total amount refunded via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount refunded.
+     */
+    public function set_refunded( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'refunded', $value );
+    }
+
+    /**
+     * Set the total amount cancelled via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount cancelled.
+     */
+    public function set_cancelled( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'cancelled', $value );
+    }
+
+    /**
+     * Set the total amount failed via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount cancelled.
+     */
+    public function set_failed( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'failed', $value );
+    }
 
     /**
      * Create an item. For backwards compatibilty.
      *
      * @deprecated
-	 * @return int item id
+     * @return int item id
      */
     public function create( $data = array() ) {
 
-		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
-		}
+        // Set the properties.
+        if ( is_array( $data ) ) {
+            $this->set_props( $data );
+        }
 
-		// Save the item.
-		return $this->save();
+        // Save the item.
+        return $this->save();
 
     }
 
@@ -637,7 +637,7 @@ 
      * Updates an item. For backwards compatibilty.
      *
      * @deprecated
-	 * @return int item id
+     * @return int item id
      */
     public function update( $data = array() ) {
         return $this->create( $data );
@@ -653,22 +653,22 @@ 
 	*/
 
     /**
-	 * Checks whether this is the default payment form.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether this is the default payment form.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_default() {
         $is_default = $this->get_id() == wpinv_get_default_payment_form();
         return (bool) apply_filters( 'wpinv_is_default_payment_form', $is_default, $this->get_id(), $this );
-	}
+    }
 
     /**
-	 * Checks whether the form is active.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether the form is active.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_active() {
         $is_active = 0 !== (int) $this->get_id();
 
@@ -677,70 +677,70 @@ 
         }
 
         return (bool) apply_filters( 'wpinv_is_payment_form_active', $is_active, $this );
-	}
-
-	/**
-	 * Checks whether the form has a given item.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+    }
+
+    /**
+     * Checks whether the form has a given item.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function has_item( $item_id ) {
         return false !== $this->get_item( $item_id );
-	}
-
-	/**
-	 * Checks whether the form has a given element.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+    }
+
+    /**
+     * Checks whether the form has a given element.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function has_element_type( $element_type ) {
         return false !== $this->get_element_type( $element_type );
-	}
-
-	/**
-	 * Checks whether this form is recurring or not.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+    }
+
+    /**
+     * Checks whether this form is recurring or not.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_recurring() {
 
-		if ( ! empty( $this->invoice ) ) {
-			return $this->invoice->is_recurring();
-		}
+        if ( ! empty( $this->invoice ) ) {
+            return $this->invoice->is_recurring();
+        }
 
-		foreach ( $this->get_items() as $item ) {
+        foreach ( $this->get_items() as $item ) {
 
-			if ( $item->is_recurring() ) {
-				return true;
-			}
+            if ( $item->is_recurring() ) {
+                return true;
+            }
 
-		}
+        }
 
         return false;
-	}
+    }
 
-	/**
-	 * Retrieves the form's html.
-	 *
-	 * @since 1.0.19
-	 */
+    /**
+     * Retrieves the form's html.
+     *
+     * @since 1.0.19
+     */
     public function get_html() {
 
-		// Return the HTML.
-		return wpinv_get_template_html( 'payment-forms/form.php', array( 'form' => $this ) );
+        // Return the HTML.
+        return wpinv_get_template_html( 'payment-forms/form.php', array( 'form' => $this ) );
 
-	}
+    }
 
-	/**
-	 * Displays the payment form.
-	 *
-	 * @since 1.0.19
-	 */
+    /**
+     * Displays the payment form.
+     *
+     * @since 1.0.19
+     */
     public function display() {
-		echo $this->get_html();
+        echo $this->get_html();
     }
 
 }

Spacing +140 added lines, -140 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -72,28 +72,28 @@ 
 	 *
 	 * @param  int|object|GetPaid_Payment_Form|WP_Post $form Form to read.
 	 */
-	public function __construct( $form = 0 ) {
-		parent::__construct( $form );
+	public function __construct($form = 0) {
+		parent::__construct($form);
 
-		if ( is_numeric( $form ) && $form > 0 ) {
-			$this->set_id( $form );
-		} elseif ( $form instanceof self ) {
+		if (is_numeric($form) && $form > 0) {
+			$this->set_id($form);
+		} elseif ($form instanceof self) {
 
-			$this->set_id( $form->get_id() );
+			$this->set_id($form->get_id());
 			$this->invoice = $form->invoice;
 
-		} elseif ( ! empty( $form->ID ) ) {
-			$this->set_id( $form->ID );
+		} elseif (!empty($form->ID)) {
+			$this->set_id($form->ID);
 		} else {
-			$this->set_object_read( true );
+			$this->set_object_read(true);
 		}
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+		$this->data_store = GetPaid_Data_Store::load($this->data_store_name);
 
-		if ( $this->get_id() > 0 ) {
-            $this->post = get_post( $this->get_id() );
-			$this->data_store->read( $this );
+		if ($this->get_id() > 0) {
+            $this->post = get_post($this->get_id());
+			$this->data_store->read($this);
         }
 
 	}
@@ -120,8 +120,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+	public function get_version($context = 'view') {
+		return $this->get_prop('version', $context);
     }
 
     /**
@@ -131,8 +131,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+	public function get_date_created($context = 'view') {
+		return $this->get_prop('date_created', $context);
     }
 
     /**
@@ -142,11 +142,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created_gmt( $context = 'view' ) {
-        $date = $this->get_date_created( $context );
+	public function get_date_created_gmt($context = 'view') {
+        $date = $this->get_date_created($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -158,8 +158,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+	public function get_date_modified($context = 'view') {
+		return $this->get_prop('date_modified', $context);
     }
 
     /**
@@ -169,11 +169,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
-        $date = $this->get_date_modified( $context );
+	public function get_date_modified_gmt($context = 'view') {
+        $date = $this->get_date_modified($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -185,8 +185,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_name( $context = 'view' ) {
-		return $this->get_prop( 'name', $context );
+	public function get_name($context = 'view') {
+		return $this->get_prop('name', $context);
     }
 
     /**
@@ -196,8 +196,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
+	public function get_title($context = 'view') {
+		return $this->get_name($context);
 	}
 
     /**
@@ -207,8 +207,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+	public function get_author($context = 'view') {
+		return (int) $this->get_prop('author', $context);
     }
 
     /**
@@ -218,21 +218,21 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_elements( $context = 'view' ) {
-		$elements = $this->get_prop( 'elements', $context );
+	public function get_elements($context = 'view') {
+		$elements = $this->get_prop('elements', $context);
 
-		if ( empty( $elements ) || ! is_array( $elements ) ) {
-            return wpinv_get_data( 'sample-payment-form' );
+		if (empty($elements) || !is_array($elements)) {
+            return wpinv_get_data('sample-payment-form');
 		}
 
 		// Ensure that all required elements exist.
 		$_elements = array();
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 
-			if ( $element['type'] == 'pay_button' && ! $this->has_element_type( 'gateway_select' ) ) {
+			if ($element['type'] == 'pay_button' && !$this->has_element_type('gateway_select')) {
 
 				$_elements[] = array(
-					'text'        => __( 'Select Payment Method', 'invoicing' ),
+					'text'        => __('Select Payment Method', 'invoicing'),
 					'id'          => 'gtscicd',
 					'name'        => 'gtscicd',
 					'type'        => 'gateway_select',
@@ -257,22 +257,22 @@ 
 	 * @param  string $return objects or arrays.
 	 * @return GetPaid_Form_Item[]
 	 */
-	public function get_items( $context = 'view', $return = 'objects' ) {
-		$items = $this->get_prop( 'items', $context );
+	public function get_items($context = 'view', $return = 'objects') {
+		$items = $this->get_prop('items', $context);
 
-		if ( empty( $items ) || ! is_array( $items ) ) {
-            $items = wpinv_get_data( 'sample-payment-form-items' );
+		if (empty($items) || !is_array($items)) {
+            $items = wpinv_get_data('sample-payment-form-items');
 		}
 
 		// Convert the items.
 		$prepared = array();
 
-		foreach ( $items as $key => $value ) {
+		foreach ($items as $key => $value) {
 
 			// Form items.
-			if ( $value instanceof GetPaid_Form_Item ) {
+			if ($value instanceof GetPaid_Form_Item) {
 
-				if ( $value->can_purchase() ) {
+				if ($value->can_purchase()) {
 					$prepared[] = $value;
 				}
 
@@ -281,11 +281,11 @@ 
 			}
 
 			// $item_id => $quantity (buy buttons)
-			if ( is_numeric( $key ) && is_numeric( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+			if (is_numeric($key) && is_numeric($value)) {
+				$item = new GetPaid_Form_Item($key);
 
-				if ( $item->can_purchase() ) {
-					$item->set_quantity( $value );
+				if ($item->can_purchase()) {
+					$item->set_quantity($value);
 					$prepared[] = $item;
 				}
 
@@ -293,33 +293,33 @@ 
 			}
 
 			// Items saved via payment forms editor.
-			if ( is_array( $value ) && isset( $value['id'] ) ) {
+			if (is_array($value) && isset($value['id'])) {
 
-				$item = new GetPaid_Form_Item( $value['id'] );
+				$item = new GetPaid_Form_Item($value['id']);
 
-				if ( ! $item->can_purchase() ) {
+				if (!$item->can_purchase()) {
 					continue;
 				}
 
 				// Sub-total (Cart items).
-				if ( isset( $value['subtotal'] ) ) {
-					$item->set_price( $value['subtotal'] );
+				if (isset($value['subtotal'])) {
+					$item->set_price($value['subtotal']);
 				}
 
-				if ( isset( $value['quantity'] ) ) {
-					$item->set_quantity( $value['quantity'] );
+				if (isset($value['quantity'])) {
+					$item->set_quantity($value['quantity']);
 				}
 
-				if ( isset( $value['allow_quantities'] ) ) {
-					$item->set_allow_quantities( $value['allow_quantities'] );
+				if (isset($value['allow_quantities'])) {
+					$item->set_allow_quantities($value['allow_quantities']);
 				}
 
-				if ( isset( $value['required'] ) ) {
-					$item->set_is_required( $value['required'] );
+				if (isset($value['required'])) {
+					$item->set_is_required($value['required']);
 				}
 
-				if ( isset( $value['description'] ) ) {
-					$item->set_custom_description( $value['description'] );
+				if (isset($value['description'])) {
+					$item->set_custom_description($value['description']);
 				}
 
 				$prepared[] = $item;
@@ -328,14 +328,14 @@ 
 			}
 
 			// $item_id => array( 'price' => 10 ) (item variations)
-			if ( is_numeric( $key ) && is_array( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+			if (is_numeric($key) && is_array($value)) {
+				$item = new GetPaid_Form_Item($key);
 
-				if ( isset( $value['price'] ) && $item->user_can_set_their_price() ) {
-					$item->set_price( $value['price'] );
+				if (isset($value['price']) && $item->user_can_set_their_price()) {
+					$item->set_price($value['price']);
 				}
 
-				if ( $item->can_purchase() ) {
+				if ($item->can_purchase()) {
 					$prepared[] = $item;
 				}
 
@@ -344,12 +344,12 @@ 
 
 		}
 
-		if ( 'objects' == $return && 'view' == $context ) {
+		if ('objects' == $return && 'view' == $context) {
 			return $prepared;
 		}
 
 		$items = array();
-		foreach ( $prepared as $item ) {
+		foreach ($prepared as $item) {
 			$items[] = $item->prepare_data_for_use();
 		}
 
@@ -363,14 +363,14 @@ 
 	 * @param  int $item_id The item id to return.
 	 * @return GetPaid_Form_Item|bool
 	 */
-	public function get_item( $item_id ) {
+	public function get_item($item_id) {
 
-		if ( empty( $item_id ) || ! is_numeric( $item_id ) ) {
+		if (empty($item_id) || !is_numeric($item_id)) {
 			return false;
 		}
 
-		foreach( $this->get_items() as $item ) {
-			if ( $item->get_id() == (int) $item_id ) {
+		foreach ($this->get_items() as $item) {
+			if ($item->get_id() == (int) $item_id) {
 				return $item;
 			}
 		}
@@ -386,15 +386,15 @@ 
 	 * @param  string $element_type The element type to return.
 	 * @return array|bool
 	 */
-	public function get_element_type( $element_type ) {
+	public function get_element_type($element_type) {
 
-		if ( empty( $element_type ) || ! is_scalar( $element_type ) ) {
+		if (empty($element_type) || !is_scalar($element_type)) {
 			return false;
 		}
 
-		foreach ( $this->get_prop( 'elements' ) as $element ) {
+		foreach ($this->get_prop('elements') as $element) {
 
-			if ( $element['type'] == $element_type ) {
+			if ($element['type'] == $element_type) {
 				return $element;
 			}
 
@@ -411,8 +411,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_earned( $context = 'view' ) {
-		return $this->get_prop( 'earned', $context );
+	public function get_earned($context = 'view') {
+		return $this->get_prop('earned', $context);
 	}
 
 	/**
@@ -422,8 +422,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_refunded( $context = 'view' ) {
-		return $this->get_prop( 'refunded', $context );
+	public function get_refunded($context = 'view') {
+		return $this->get_prop('refunded', $context);
 	}
 
 	/**
@@ -433,8 +433,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_cancelled( $context = 'view' ) {
-		return $this->get_prop( 'cancelled', $context );
+	public function get_cancelled($context = 'view') {
+		return $this->get_prop('cancelled', $context);
 	}
 
 	/**
@@ -444,8 +444,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_failed( $context = 'view' ) {
-		return $this->get_prop( 'failed', $context );
+	public function get_failed($context = 'view') {
+		return $this->get_prop('failed', $context);
 	}
 
 	/**
@@ -456,8 +456,8 @@ 
 	 * @return string
 	 */
 	public function get_currency() {
-		$currency = empty( $this->invoice ) ? wpinv_get_currency() : $this->invoice->get_currency();
-		return apply_filters( 'getpaid-payment-form-currency', $currency, $this );
+		$currency = empty($this->invoice) ? wpinv_get_currency() : $this->invoice->get_currency();
+		return apply_filters('getpaid-payment-form-currency', $currency, $this);
 	}
 
     /*
@@ -475,8 +475,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+	public function set_version($value) {
+		$this->set_prop('version', $value);
     }
 
     /**
@@ -486,11 +486,11 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_created( $value ) {
-        $date = strtotime( $value );
+	public function set_date_created($value) {
+        $date = strtotime($value);
 
-        if ( $date ) {
-            $this->set_prop( 'date_created', date( 'Y-m-d H:i:s', $date ) );
+        if ($date) {
+            $this->set_prop('date_created', date('Y-m-d H:i:s', $date));
             return true;
         }
 
@@ -505,11 +505,11 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_modified( $value ) {
-        $date = strtotime( $value );
+	public function set_date_modified($value) {
+        $date = strtotime($value);
 
-        if ( $date ) {
-            $this->set_prop( 'date_modified', date( 'Y-m-d H:i:s', $date ) );
+        if ($date) {
+            $this->set_prop('date_modified', date('Y-m-d H:i:s', $date));
             return true;
         }
 
@@ -523,8 +523,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_name( $value ) {
-		$this->set_prop( 'name', sanitize_text_field( $value ) );
+	public function set_name($value) {
+		$this->set_prop('name', sanitize_text_field($value));
     }
 
     /**
@@ -533,8 +533,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
+	public function set_title($value) {
+		$this->set_name($value);
     }
 
     /**
@@ -543,8 +543,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value New author.
 	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
+	public function set_author($value) {
+		$this->set_prop('author', (int) $value);
 	}
 
 	/**
@@ -553,9 +553,9 @@ 
 	 * @since 1.0.19
 	 * @param  array $value Form elements.
 	 */
-	public function set_elements( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'elements', $value );
+	public function set_elements($value) {
+		if (is_array($value)) {
+			$this->set_prop('elements', $value);
 		}
 	}
 
@@ -565,9 +565,9 @@ 
 	 * @since 1.0.19
 	 * @param  array $value Form elements.
 	 */
-	public function set_items( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'items', $value );
+	public function set_items($value) {
+		if (is_array($value)) {
+			$this->set_prop('items', $value);
 		}
 	}
 
@@ -577,9 +577,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount earned.
 	 */
-	public function set_earned( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'earned', $value );
+	public function set_earned($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('earned', $value);
 	}
 
 	/**
@@ -588,9 +588,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount refunded.
 	 */
-	public function set_refunded( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'refunded', $value );
+	public function set_refunded($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('refunded', $value);
 	}
 
 	/**
@@ -599,9 +599,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount cancelled.
 	 */
-	public function set_cancelled( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'cancelled', $value );
+	public function set_cancelled($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('cancelled', $value);
 	}
 
 	/**
@@ -610,9 +610,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount cancelled.
 	 */
-	public function set_failed( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'failed', $value );
+	public function set_failed($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('failed', $value);
 	}
 
     /**
@@ -621,11 +621,11 @@ 
      * @deprecated
 	 * @return int item id
      */
-    public function create( $data = array() ) {
+    public function create($data = array()) {
 
 		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
+		if (is_array($data)) {
+			$this->set_props($data);
 		}
 
 		// Save the item.
@@ -639,8 +639,8 @@ 
      * @deprecated
 	 * @return int item id
      */
-    public function update( $data = array() ) {
-        return $this->create( $data );
+    public function update($data = array()) {
+        return $this->create($data);
     }
 
     /*
@@ -660,7 +660,7 @@ 
 	 */
     public function is_default() {
         $is_default = $this->get_id() == wpinv_get_default_payment_form();
-        return (bool) apply_filters( 'wpinv_is_default_payment_form', $is_default, $this->get_id(), $this );
+        return (bool) apply_filters('wpinv_is_default_payment_form', $is_default, $this->get_id(), $this);
 	}
 
     /**
@@ -672,11 +672,11 @@ 
     public function is_active() {
         $is_active = 0 !== (int) $this->get_id();
 
-        if ( $is_active && ! current_user_can( 'edit_post', $this->get_id() ) && $this->get_status() != 'publish' ) {
+        if ($is_active && !current_user_can('edit_post', $this->get_id()) && $this->get_status() != 'publish') {
             $is_active = false;
         }
 
-        return (bool) apply_filters( 'wpinv_is_payment_form_active', $is_active, $this );
+        return (bool) apply_filters('wpinv_is_payment_form_active', $is_active, $this);
 	}
 
 	/**
@@ -685,8 +685,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-    public function has_item( $item_id ) {
-        return false !== $this->get_item( $item_id );
+    public function has_item($item_id) {
+        return false !== $this->get_item($item_id);
 	}
 
 	/**
@@ -695,8 +695,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-    public function has_element_type( $element_type ) {
-        return false !== $this->get_element_type( $element_type );
+    public function has_element_type($element_type) {
+        return false !== $this->get_element_type($element_type);
 	}
 
 	/**
@@ -707,13 +707,13 @@ 
 	 */
     public function is_recurring() {
 
-		if ( ! empty( $this->invoice ) ) {
+		if (!empty($this->invoice)) {
 			return $this->invoice->is_recurring();
 		}
 
-		foreach ( $this->get_items() as $item ) {
+		foreach ($this->get_items() as $item) {
 
-			if ( $item->is_recurring() ) {
+			if ($item->is_recurring()) {
 				return true;
 			}
 
@@ -730,7 +730,7 @@ 
     public function get_html() {
 
 		// Return the HTML.
-		return wpinv_get_template_html( 'payment-forms/form.php', array( 'form' => $this ) );
+		return wpinv_get_template_html('payment-forms/form.php', array('form' => $this));
 
 	}
 

includes/payments/class-getpaid-payment-form-submission-discount.php

Indentation +181 added lines, -181 removed lines

@@ -12,189 +12,189 @@
  */
 class GetPaid_Payment_Form_Submission_Discount {
 
-	/**
-	 * Submission discounts.
-	 * @var array
-	 */
-	public $discounts = array();
+    /**
+     * Submission discounts.
+     * @var array
+     */
+    public $discounts = array();
+
+    /**
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param float                           $initial_total
+     * @param float                           $recurring_total
+     */
+    public function __construct( $submission, $initial_total, $recurring_total ) {
+
+        // Process any existing invoice discounts.
+        if ( $submission->has_invoice() ) {
+            $this->discounts = $submission->get_invoice()->get_discounts();
+        }
+
+        // Do we have a discount?
+        $discount = $submission->get_field( 'discount' );
+
+        if ( empty( $discount ) ) {
+
+            if ( isset( $this->discounts['discount_code'] ) ) {
+                unset( $this->discounts['discount_code'] );
+            }
+
+            return;
+        }
+
+        // Processes the discount code.
+        $amount = max( $initial_total, $recurring_total );
+        $this->process_discount( $submission, $discount, $amount );
+
+    }
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param float                           $initial_total
-	 * @param float                           $recurring_total
-	 */
-	public function __construct( $submission, $initial_total, $recurring_total ) {
-
-		// Process any existing invoice discounts.
-		if ( $submission->has_invoice() ) {
-			$this->discounts = $submission->get_invoice()->get_discounts();
-		}
-
-		// Do we have a discount?
-		$discount = $submission->get_field( 'discount' );
-
-		if ( empty( $discount ) ) {
-
-			if ( isset( $this->discounts['discount_code'] ) ) {
-				unset( $this->discounts['discount_code'] );
-			}
-
-			return;
-		}
-
-		// Processes the discount code.
-		$amount = max( $initial_total, $recurring_total );
-		$this->process_discount( $submission, $discount, $amount );
-
-	}
-
-	/**
-	 * Processes a submission discount.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param string                          $discount
-	 * @param float                           $amount
-	 */
-	public function process_discount( $submission, $discount, $amount ) {
-
-		// Fetch the discount.
-		$discount = new WPInv_Discount( $discount );
-
-		// Ensure it is active.
+     * Processes a submission discount.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param string                          $discount
+     * @param float                           $amount
+     */
+    public function process_discount( $submission, $discount, $amount ) {
+
+        // Fetch the discount.
+        $discount = new WPInv_Discount( $discount );
+
+        // Ensure it is active.
         if ( ! $this->is_discount_active( $discount ) ) {
-			throw new Exception( __( 'Invalid or expired discount code', 'invoicing' ) );
-		}
-
-		// Exceeded limit.
-		if ( $discount->has_exceeded_limit() ) {
-			throw new Exception( __( 'This discount code has been used up', 'invoicing' ) );
-		}
-
-		// Validate usages.
-		$this->validate_single_use_discount( $submission, $discount );
-
-		// Validate amount.
-		$this->validate_discount_amount( $submission, $discount, $amount );
-
-		// Save the discount.
-		$this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
-	}
-
-	/**
-	 * Validates a single use discount.
-	 *
-	 * @param WPInv_Discount                  $discount
-	 * @return bool
-	 */
-	public function is_discount_active(  $discount ) {
-		return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
-	}
-
-	/**
-	 * Returns a user's id or email.
-	 *
-	 * @param string $email
-	 * @return int|string|false
-	 */
-	public function get_user_id_or_email( $email ) {
-
-		if ( is_user_logged_in() ) {
-			return get_current_user_id();
-		}
-
-		return empty( $email ) ? false : sanitize_email( $email );
-	}
-
-	/**
-	 * Validates a single use discount.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param WPInv_Discount                  $discount
-	 */
-	public function validate_single_use_discount( $submission, $discount ) {
-
-		// Abort if it is not a single use discount.
-		if ( ! $discount->is_single_use() ) {
-			return;
-		}
-
-		// Ensure there is a valid billing email.
-		$user = $this->get_user_id_or_email( $submission->get_billing_email() );
-
-		if ( empty( $user ) ) {
-			throw new Exception( __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
-		}
-
-		// Has the user used this discount code before?
-		if ( ! $discount->is_valid_for_user( $user ) ) {
-			throw new Exception( __( 'You have already used this discount', 'invoicing' ) );
-		}
-
-	}
-
-	/**
-	 * Validates the discount's amount.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param WPInv_Discount         $discount
-	 * @param float                  $amount
-	 */
-	public function validate_discount_amount( $submission, $discount, $amount ) {
-
-		// Validate minimum amount.
-		if ( ! $discount->is_minimum_amount_met( $amount ) ) {
-			$min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
-			throw new Exception( sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
-		}
-
-		// Validate the maximum amount.
-		if ( ! $discount->is_maximum_amount_met( $amount ) ) {
-			$max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
-			throw new Exception( sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
-		}
-
-	}
-
-	/**
-	 * Calculates the discount code's amount.
-	 *
-	 * Ensure that the discount exists and has been validated before calling this method.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param WPInv_Discount                  $discount
-	 * @return array
-	 */
-	public function calculate_discount( $submission, $discount ) {
-
-		$initial_discount   = 0;
-		$recurring_discount = 0;
-
-		foreach ( $submission->get_items() as $item ) {
-
-			// Abort if it is not valid for this item.
-			if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
-				continue;
-			}
-
-			// Calculate the initial amount...
-			$initial_discount += $discount->get_discounted_amount( $item->get_sub_total() );
-
-			// ... and maybe the recurring amount.
-			if ( $item->is_recurring() && $discount->is_recurring() ) {
-				$recurring_discount += $discount->get_discounted_amount( $item->get_recurring_sub_total() );
-			}
-
-		}
-
-		return array(
-			'name'               => 'discount_code',
-			'discount_code'      => $discount->get_code(),
-			'initial_discount'   => $initial_discount,
-			'recurring_discount' => $recurring_discount,
-		);
-
-	}
+            throw new Exception( __( 'Invalid or expired discount code', 'invoicing' ) );
+        }
+
+        // Exceeded limit.
+        if ( $discount->has_exceeded_limit() ) {
+            throw new Exception( __( 'This discount code has been used up', 'invoicing' ) );
+        }
+
+        // Validate usages.
+        $this->validate_single_use_discount( $submission, $discount );
+
+        // Validate amount.
+        $this->validate_discount_amount( $submission, $discount, $amount );
+
+        // Save the discount.
+        $this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
+    }
+
+    /**
+     * Validates a single use discount.
+     *
+     * @param WPInv_Discount                  $discount
+     * @return bool
+     */
+    public function is_discount_active(  $discount ) {
+        return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
+    }
+
+    /**
+     * Returns a user's id or email.
+     *
+     * @param string $email
+     * @return int|string|false
+     */
+    public function get_user_id_or_email( $email ) {
+
+        if ( is_user_logged_in() ) {
+            return get_current_user_id();
+        }
+
+        return empty( $email ) ? false : sanitize_email( $email );
+    }
+
+    /**
+     * Validates a single use discount.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param WPInv_Discount                  $discount
+     */
+    public function validate_single_use_discount( $submission, $discount ) {
+
+        // Abort if it is not a single use discount.
+        if ( ! $discount->is_single_use() ) {
+            return;
+        }
+
+        // Ensure there is a valid billing email.
+        $user = $this->get_user_id_or_email( $submission->get_billing_email() );
+
+        if ( empty( $user ) ) {
+            throw new Exception( __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
+        }
+
+        // Has the user used this discount code before?
+        if ( ! $discount->is_valid_for_user( $user ) ) {
+            throw new Exception( __( 'You have already used this discount', 'invoicing' ) );
+        }
+
+    }
+
+    /**
+     * Validates the discount's amount.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param WPInv_Discount         $discount
+     * @param float                  $amount
+     */
+    public function validate_discount_amount( $submission, $discount, $amount ) {
+
+        // Validate minimum amount.
+        if ( ! $discount->is_minimum_amount_met( $amount ) ) {
+            $min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
+            throw new Exception( sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
+        }
+
+        // Validate the maximum amount.
+        if ( ! $discount->is_maximum_amount_met( $amount ) ) {
+            $max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
+            throw new Exception( sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
+        }
+
+    }
+
+    /**
+     * Calculates the discount code's amount.
+     *
+     * Ensure that the discount exists and has been validated before calling this method.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param WPInv_Discount                  $discount
+     * @return array
+     */
+    public function calculate_discount( $submission, $discount ) {
+
+        $initial_discount   = 0;
+        $recurring_discount = 0;
+
+        foreach ( $submission->get_items() as $item ) {
+
+            // Abort if it is not valid for this item.
+            if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+                continue;
+            }
+
+            // Calculate the initial amount...
+            $initial_discount += $discount->get_discounted_amount( $item->get_sub_total() );
+
+            // ... and maybe the recurring amount.
+            if ( $item->is_recurring() && $discount->is_recurring() ) {
+                $recurring_discount += $discount->get_discounted_amount( $item->get_recurring_sub_total() );
+            }
+
+        }
+
+        return array(
+            'name'               => 'discount_code',
+            'discount_code'      => $discount->get_code(),
+            'initial_discount'   => $initial_discount,
+            'recurring_discount' => $recurring_discount,
+        );
+
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission discount class
@@ -25,28 +25,28 @@ 
 	 * @param float                           $initial_total
 	 * @param float                           $recurring_total
 	 */
-	public function __construct( $submission, $initial_total, $recurring_total ) {
+	public function __construct($submission, $initial_total, $recurring_total) {
 
 		// Process any existing invoice discounts.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$this->discounts = $submission->get_invoice()->get_discounts();
 		}
 
 		// Do we have a discount?
-		$discount = $submission->get_field( 'discount' );
+		$discount = $submission->get_field('discount');
 
-		if ( empty( $discount ) ) {
+		if (empty($discount)) {
 
-			if ( isset( $this->discounts['discount_code'] ) ) {
-				unset( $this->discounts['discount_code'] );
+			if (isset($this->discounts['discount_code'])) {
+				unset($this->discounts['discount_code']);
 			}
 
 			return;
 		}
 
 		// Processes the discount code.
-		$amount = max( $initial_total, $recurring_total );
-		$this->process_discount( $submission, $discount, $amount );
+		$amount = max($initial_total, $recurring_total);
+		$this->process_discount($submission, $discount, $amount);
 
 	}
 
@@ -57,29 +57,29 @@ 
 	 * @param string                          $discount
 	 * @param float                           $amount
 	 */
-	public function process_discount( $submission, $discount, $amount ) {
+	public function process_discount($submission, $discount, $amount) {
 
 		// Fetch the discount.
-		$discount = new WPInv_Discount( $discount );
+		$discount = new WPInv_Discount($discount);
 
 		// Ensure it is active.
-        if ( ! $this->is_discount_active( $discount ) ) {
-			throw new Exception( __( 'Invalid or expired discount code', 'invoicing' ) );
+        if (!$this->is_discount_active($discount)) {
+			throw new Exception(__('Invalid or expired discount code', 'invoicing'));
 		}
 
 		// Exceeded limit.
-		if ( $discount->has_exceeded_limit() ) {
-			throw new Exception( __( 'This discount code has been used up', 'invoicing' ) );
+		if ($discount->has_exceeded_limit()) {
+			throw new Exception(__('This discount code has been used up', 'invoicing'));
 		}
 
 		// Validate usages.
-		$this->validate_single_use_discount( $submission, $discount );
+		$this->validate_single_use_discount($submission, $discount);
 
 		// Validate amount.
-		$this->validate_discount_amount( $submission, $discount, $amount );
+		$this->validate_discount_amount($submission, $discount, $amount);
 
 		// Save the discount.
-		$this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
+		$this->discounts['discount_code'] = $this->calculate_discount($submission, $discount);
 	}
 
 	/**
@@ -88,8 +88,8 @@ 
 	 * @param WPInv_Discount                  $discount
 	 * @return bool
 	 */
-	public function is_discount_active(  $discount ) {
-		return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
+	public function is_discount_active($discount) {
+		return $discount->exists() && $discount->is_active() && $discount->has_started() && !$discount->is_expired();
 	}
 
 	/**
@@ -98,13 +98,13 @@ 
 	 * @param string $email
 	 * @return int|string|false
 	 */
-	public function get_user_id_or_email( $email ) {
+	public function get_user_id_or_email($email) {
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			return get_current_user_id();
 		}
 
-		return empty( $email ) ? false : sanitize_email( $email );
+		return empty($email) ? false : sanitize_email($email);
 	}
 
 	/**
@@ -113,23 +113,23 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @param WPInv_Discount                  $discount
 	 */
-	public function validate_single_use_discount( $submission, $discount ) {
+	public function validate_single_use_discount($submission, $discount) {
 
 		// Abort if it is not a single use discount.
-		if ( ! $discount->is_single_use() ) {
+		if (!$discount->is_single_use()) {
 			return;
 		}
 
 		// Ensure there is a valid billing email.
-		$user = $this->get_user_id_or_email( $submission->get_billing_email() );
+		$user = $this->get_user_id_or_email($submission->get_billing_email());
 
-		if ( empty( $user ) ) {
-			throw new Exception( __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
+		if (empty($user)) {
+			throw new Exception(__('You need to either log in or enter your billing email before applying this discount', 'invoicing'));
 		}
 
 		// Has the user used this discount code before?
-		if ( ! $discount->is_valid_for_user( $user ) ) {
-			throw new Exception( __( 'You have already used this discount', 'invoicing' ) );
+		if (!$discount->is_valid_for_user($user)) {
+			throw new Exception(__('You have already used this discount', 'invoicing'));
 		}
 
 	}
@@ -141,18 +141,18 @@ 
 	 * @param WPInv_Discount         $discount
 	 * @param float                  $amount
 	 */
-	public function validate_discount_amount( $submission, $discount, $amount ) {
+	public function validate_discount_amount($submission, $discount, $amount) {
 
 		// Validate minimum amount.
-		if ( ! $discount->is_minimum_amount_met( $amount ) ) {
-			$min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
-			throw new Exception( sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
+		if (!$discount->is_minimum_amount_met($amount)) {
+			$min = wpinv_price($discount->get_minimum_total(), $submission->get_currency());
+			throw new Exception(sprintf(__('The minimum total for using this discount is %s', 'invoicing'), $min));
 		}
 
 		// Validate the maximum amount.
-		if ( ! $discount->is_maximum_amount_met( $amount ) ) {
-			$max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
-			throw new Exception( sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
+		if (!$discount->is_maximum_amount_met($amount)) {
+			$max = wpinv_price($discount->get_maximum_total(), $submission->get_currency());
+			throw new Exception(sprintf(__('The maximum total for using this discount is %s', 'invoicing'), $max));
 		}
 
 	}
@@ -166,24 +166,24 @@ 
 	 * @param WPInv_Discount                  $discount
 	 * @return array
 	 */
-	public function calculate_discount( $submission, $discount ) {
+	public function calculate_discount($submission, $discount) {
 
 		$initial_discount   = 0;
 		$recurring_discount = 0;
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 
 			// Abort if it is not valid for this item.
-			if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+			if (!$discount->is_valid_for_items(array($item->get_id()))) {
 				continue;
 			}
 
 			// Calculate the initial amount...
-			$initial_discount += $discount->get_discounted_amount( $item->get_sub_total() );
+			$initial_discount += $discount->get_discounted_amount($item->get_sub_total());
 
 			// ... and maybe the recurring amount.
-			if ( $item->is_recurring() && $discount->is_recurring() ) {
-				$recurring_discount += $discount->get_discounted_amount( $item->get_recurring_sub_total() );
+			if ($item->is_recurring() && $discount->is_recurring()) {
+				$recurring_discount += $discount->get_discounted_amount($item->get_recurring_sub_total());
 			}
 
 		}

templates/payment-forms-admin/edit/alert.php

Spacing +13 added lines, -13 removed lines

@@ -7,33 +7,33 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Alert Text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Alert Text', 'invoicing'); ?></span>
         <textarea v-model='active_form_element.text' class='form-control' rows='3'></textarea>
     </label>
 </div>
 
 <div class='form-group form-check'>
     <input :id="active_form_element.id + '_edit_dismissible'" v-model='active_form_element.dismissible' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_edit_dismissible'"><?php esc_html_e( 'Is Dismissible?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_edit_dismissible'"><?php esc_html_e('Is Dismissible?', 'invoicing'); ?></label>
 </div>
 
 <div class='form-group'>
-    <label :for="active_form_element.id + '_edit_type'"><?php esc_html_e( 'Alert Type', 'invoicing' ) ?></label>
+    <label :for="active_form_element.id + '_edit_type'"><?php esc_html_e('Alert Type', 'invoicing') ?></label>
     <select class='form-control custom-select' :id="active_form_element.id + '_edit_type'" v-model='active_form_element.class'>
-        <option value='alert-primary'><?php esc_html_e( 'Primary', 'invoicing' ); ?></option>
-        <option value='alert-secondary'><?php esc_html_e( 'Secondary', 'invoicing' ); ?></option>
-        <option value='alert-success'><?php esc_html_e( 'Success', 'invoicing' ); ?></option>
-        <option value='alert-danger'><?php esc_html_e( 'Danger', 'invoicing' ); ?></option>
-        <option value='alert-warning'><?php esc_html_e( 'Warning', 'invoicing' ); ?></option>
-        <option value='alert-info'><?php esc_html_e( 'Info', 'invoicing' ); ?></option>
-        <option value='alert-light'><?php esc_html_e( 'Light', 'invoicing' ); ?></option>
-        <option value='alert-dark'><?php esc_html_e( 'Dark', 'invoicing' ); ?></option>
-        <option value='alert-link'><?php esc_html_e( 'Link', 'invoicing' ); ?></option>
+        <option value='alert-primary'><?php esc_html_e('Primary', 'invoicing'); ?></option>
+        <option value='alert-secondary'><?php esc_html_e('Secondary', 'invoicing'); ?></option>
+        <option value='alert-success'><?php esc_html_e('Success', 'invoicing'); ?></option>
+        <option value='alert-danger'><?php esc_html_e('Danger', 'invoicing'); ?></option>
+        <option value='alert-warning'><?php esc_html_e('Warning', 'invoicing'); ?></option>
+        <option value='alert-info'><?php esc_html_e('Info', 'invoicing'); ?></option>
+        <option value='alert-light'><?php esc_html_e('Light', 'invoicing'); ?></option>
+        <option value='alert-dark'><?php esc_html_e('Dark', 'invoicing'); ?></option>
+        <option value='alert-link'><?php esc_html_e('Link', 'invoicing'); ?></option>
     </select>
 </div>

templates/payment-forms/elements/price_input.php

Spacing +11 added lines, -11 removed lines

@@ -7,30 +7,30 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // 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';
 }
 
 echo aui()->input(
     array(
-        'name'              => esc_attr( $id ),
-        'id'                => esc_attr( $id ) . uniqid( '_' ),
-        'placeholder'       => empty( $placeholder ) ? wpinv_format_amount(0) : wpinv_format_amount( $placeholder ),
-        'value'             => empty( $value ) ? wpinv_format_amount(0) : wpinv_format_amount( $value ),
-        'label'             => empty( $label ) ? '' : wp_kses_post( $label ),
+        'name'              => esc_attr($id),
+        'id'                => esc_attr($id) . uniqid('_'),
+        'placeholder'       => empty($placeholder) ? wpinv_format_amount(0) : wpinv_format_amount($placeholder),
+        'value'             => empty($value) ? wpinv_format_amount(0) : wpinv_format_amount($value),
+        'label'             => empty($label) ? '' : wp_kses_post($label),
         'label_type'        => 'vertical',
-        'help_text'         => empty( $description ) ? '' : wp_kses_post( $description ),
-        'input_group_right' => $position == 'right' ? wpinv_currency_symbol( $form->get_currency() ) : '',
-        'input_group_left'  => $position == 'left' ? wpinv_currency_symbol( $form->get_currency() ) : '',
+        'help_text'         => empty($description) ? '' : wp_kses_post($description),
+        'input_group_right' => $position == 'right' ? wpinv_currency_symbol($form->get_currency()) : '',
+        'input_group_left'  => $position == 'left' ? wpinv_currency_symbol($form->get_currency()) : '',
         'class'             => 'getpaid-refresh-on-change',
     )
 );

includes/admin/class-getpaid-post-types-admin.php

Indentation +615 added lines, -615 removed lines

@@ -13,616 +13,616 @@ 
 class GetPaid_Post_Types_Admin {
 
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
-
-		// Init metaboxes.
-		GetPaid_Metaboxes::init();
-
-		// Filter the post updated messages.
-		add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
-
-		// Filter post actions.
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
-
-		// Invoice table columns.
-		add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
-		add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
-
-		// Items table columns.
-		add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
-		add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
-		add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
-		add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
-		add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
-
-		// Payment forms columns.
-		add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
-		add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
-
-		// Discount table columns.
-		add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
-
-		// Deleting posts.
-		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
-	}
-
-	/**
-	 * Post updated messages.
-	 */
-	public static function post_updated_messages( $messages ) {
-		global $post;
-
-		$messages['wpi_discount'] = array(
-			0   => '',
-			1   => __( 'Discount updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Discount updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Discount updated.', 'invoicing' ),
-			7   => __( 'Discount saved.', 'invoicing' ),
-			8   => __( 'Discount submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Discount draft updated.', 'invoicing' ),
-		);
-
-		$messages['wpi_payment_form'] = array(
-			0   => '',
-			1   => __( 'Payment Form updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Payment Form updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Payment Form updated.', 'invoicing' ),
-			7   => __( 'Payment Form saved.', 'invoicing' ),
-			8   => __( 'Payment Form submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Payment Form draft updated.', 'invoicing' ),
-		);
-
-		return $messages;
-
-	}
-
-	/**
-	 * Post row actions.
-	 */
-	public static function post_row_actions( $actions, $post ) {
-
-		$post = get_post( $post );
-
-		// We do not want to edit the default payment form.
-		if ( 'wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form() ) {
-			unset( $actions['trash'] );
-			unset( $actions['inline hide-if-no-js'] );
-		}
-
-		return $actions;
-	}
-
-	/**
-	 * Returns an array of invoice table columns.
-	 */
-	public static function invoice_columns( $columns ) {
-
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'number'            => __( 'Invoice', 'invoicing' ),
-			'customer'          => __( 'Customer', 'invoicing' ),
-			'invoice_date'      => __( 'Date', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'recurring'         => __( 'Recurring', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'wpi_actions'       => __( 'Actions', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpi_invoice_table_columns', $columns );
-	}
-
-	/**
-	 * Displays invoice table columns.
-	 */
-	public static function display_invoice_columns( $column_name, $post_id ) {
-
-		$invoice = new WPInv_Invoice( $post_id );
-
-		switch ( $column_name ) {
-
-			case 'invoice_date' :
-				$date_time = esc_attr( $invoice->get_created_date() );
-				$date      = getpaid_format_date_value( $date_time );
-				echo "<span title='$date_time'>$date</span>";
-				break;
-
-			case 'amount' :
-
-				$amount = $invoice->get_total();
-				$formated_amount = wpinv_price( wpinv_format_amount( $amount ), $invoice->get_currency() );
-
-				if ( $invoice->is_refunded() ) {
-					$refunded_amount = wpinv_price( wpinv_format_amount( 0 ), $invoice->get_currency() );
-					echo "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>";
-				} else {
-
-					$discount = $invoice->get_total_discount();
-
-					if ( ! empty( $discount ) ) {
-						$new_amount = wpinv_price( wpinv_format_amount( $amount + $discount ), $invoice->get_currency() );
-						echo "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>";
-					} else {
-						echo $formated_amount;
-					}
-
-				}
-
-				break;
-
-			case 'status' :
-				$status       = sanitize_text_field( $invoice->get_status() );
-				$status_label = sanitize_text_field( $invoice->get_status_nicename() );
-
-				// If it is paid, show the gateway title.
-				if ( $invoice->is_paid() ) {
-					$gateway = sanitize_text_field( $invoice->get_gateway_title() );
-					$gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), $gateway );
+     * Hook in methods.
+     */
+    public static function init() {
 
-					echo "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>";
-				} else {
-					echo "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>";
-				}
+        // Init metaboxes.
+        GetPaid_Metaboxes::init();
 
-				// If it is not paid, display the overdue and view status.
-				if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+        // Filter the post updated messages.
+        add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
 
-					// Invoice view status.
-					if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="'. esc_attr__( 'Viewed by Customer', 'invoicing' ).'"></i>';
-					} else {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="'. esc_attr__( 'Not Viewed by Customer', 'invoicing' ).'"></i>';
-					}
+        // Filter post actions.
+        add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
 
-					// Display the overview status.
-					if ( wpinv_get_option( 'overdue_active' ) ) {
-						$due_date = $invoice->get_due_date();
-						$fomatted = getpaid_format_date( $due_date );
+        // Invoice table columns.
+        add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
+        add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
 
-						if ( ! empty( $fomatted ) ) {
-							$date = wp_sprintf( __( 'Due %s', 'invoicing' ), $fomatted );
-							echo "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>";
-						}
-					}
+        // Items table columns.
+        add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
+        add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
+        add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
+        add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
+        add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
+        add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
 
-				}
+        // Payment forms columns.
+        add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
+        add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
 
-				break;
+        // Discount table columns.
+        add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
 
-			case 'recurring':
+        // Deleting posts.
+        add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
+    }
 
-				if ( $invoice->is_recurring() ) {
-					echo '<i class="fa fa-check" style="color:#43850a;"></i>';
-				} else {
-					echo '<i class="fa fa-times" style="color:#616161;"></i>';
-				}
-				break;
+    /**
+     * Post updated messages.
+     */
+    public static function post_updated_messages( $messages ) {
+        global $post;
+
+        $messages['wpi_discount'] = array(
+            0   => '',
+            1   => __( 'Discount updated.', 'invoicing' ),
+            2   => __( 'Custom field updated.', 'invoicing' ),
+            3   => __( 'Custom field deleted.', 'invoicing' ),
+            4   => __( 'Discount updated.', 'invoicing' ),
+            5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6   => __( 'Discount updated.', 'invoicing' ),
+            7   => __( 'Discount saved.', 'invoicing' ),
+            8   => __( 'Discount submitted.', 'invoicing' ),
+            9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10  => __( 'Discount draft updated.', 'invoicing' ),
+        );
+
+        $messages['wpi_payment_form'] = array(
+            0   => '',
+            1   => __( 'Payment Form updated.', 'invoicing' ),
+            2   => __( 'Custom field updated.', 'invoicing' ),
+            3   => __( 'Custom field deleted.', 'invoicing' ),
+            4   => __( 'Payment Form updated.', 'invoicing' ),
+            5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6   => __( 'Payment Form updated.', 'invoicing' ),
+            7   => __( 'Payment Form saved.', 'invoicing' ),
+            8   => __( 'Payment Form submitted.', 'invoicing' ),
+            9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10  => __( 'Payment Form draft updated.', 'invoicing' ),
+        );
+
+        return $messages;
+
+    }
+
+    /**
+     * Post row actions.
+     */
+    public static function post_row_actions( $actions, $post ) {
+
+        $post = get_post( $post );
+
+        // We do not want to edit the default payment form.
+        if ( 'wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form() ) {
+            unset( $actions['trash'] );
+            unset( $actions['inline hide-if-no-js'] );
+        }
+
+        return $actions;
+    }
+
+    /**
+     * Returns an array of invoice table columns.
+     */
+    public static function invoice_columns( $columns ) {
+
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'number'            => __( 'Invoice', 'invoicing' ),
+            'customer'          => __( 'Customer', 'invoicing' ),
+            'invoice_date'      => __( 'Date', 'invoicing' ),
+            'amount'            => __( 'Amount', 'invoicing' ),
+            'recurring'         => __( 'Recurring', 'invoicing' ),
+            'status'            => __( 'Status', 'invoicing' ),
+            'wpi_actions'       => __( 'Actions', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_invoice_table_columns', $columns );
+    }
+
+    /**
+     * Displays invoice table columns.
+     */
+    public static function display_invoice_columns( $column_name, $post_id ) {
+
+        $invoice = new WPInv_Invoice( $post_id );
+
+        switch ( $column_name ) {
+
+            case 'invoice_date' :
+                $date_time = esc_attr( $invoice->get_created_date() );
+                $date      = getpaid_format_date_value( $date_time );
+                echo "<span title='$date_time'>$date</span>";
+                break;
+
+            case 'amount' :
+
+                $amount = $invoice->get_total();
+                $formated_amount = wpinv_price( wpinv_format_amount( $amount ), $invoice->get_currency() );
+
+                if ( $invoice->is_refunded() ) {
+                    $refunded_amount = wpinv_price( wpinv_format_amount( 0 ), $invoice->get_currency() );
+                    echo "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>";
+                } else {
+
+                    $discount = $invoice->get_total_discount();
+
+                    if ( ! empty( $discount ) ) {
+                        $new_amount = wpinv_price( wpinv_format_amount( $amount + $discount ), $invoice->get_currency() );
+                        echo "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>";
+                    } else {
+                        echo $formated_amount;
+                    }
+
+                }
+
+                break;
+
+            case 'status' :
+                $status       = sanitize_text_field( $invoice->get_status() );
+                $status_label = sanitize_text_field( $invoice->get_status_nicename() );
+
+                // If it is paid, show the gateway title.
+                if ( $invoice->is_paid() ) {
+                    $gateway = sanitize_text_field( $invoice->get_gateway_title() );
+                    $gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), $gateway );
 
-			case 'number' :
+                    echo "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>";
+                } else {
+                    echo "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>";
+                }
 
-				$edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
-				$invoice_number  = sanitize_text_field( $invoice->get_number() );
-				$invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+                // If it is not paid, display the overdue and view status.
+                if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
 
-				echo "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>";
+                    // Invoice view status.
+                    if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="'. esc_attr__( 'Viewed by Customer', 'invoicing' ).'"></i>';
+                    } else {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="'. esc_attr__( 'Not Viewed by Customer', 'invoicing' ).'"></i>';
+                    }
 
-				break;
+                    // Display the overview status.
+                    if ( wpinv_get_option( 'overdue_active' ) ) {
+                        $due_date = $invoice->get_due_date();
+                        $fomatted = getpaid_format_date( $due_date );
 
-			case 'customer' :
+                        if ( ! empty( $fomatted ) ) {
+                            $date = wp_sprintf( __( 'Due %s', 'invoicing' ), $fomatted );
+                            echo "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>";
+                        }
+                    }
+
+                }
+
+                break;
+
+            case 'recurring':
+
+                if ( $invoice->is_recurring() ) {
+                    echo '<i class="fa fa-check" style="color:#43850a;"></i>';
+                } else {
+                    echo '<i class="fa fa-times" style="color:#616161;"></i>';
+                }
+                break;
+
+            case 'number' :
+
+                $edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
+                $invoice_number  = sanitize_text_field( $invoice->get_number() );
+                $invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+
+                echo "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>";
+
+                break;
+
+            case 'customer' :
 	
-				$customer_name = $invoice->get_user_full_name();
+                $customer_name = $invoice->get_user_full_name();
 	
-				if ( empty( $customer_name ) ) {
-					$customer_name = $invoice->get_email();
-				}
+                if ( empty( $customer_name ) ) {
+                    $customer_name = $invoice->get_email();
+                }
 	
-				if ( ! empty( $customer_name ) ) {
-					$customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
-					$view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
-					echo "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>";
-				} else {
-					echo '<div>&mdash;</div>';
-				}
+                if ( ! empty( $customer_name ) ) {
+                    $customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
+                    $view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
+                    echo "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>";
+                } else {
+                    echo '<div>&mdash;</div>';
+                }
+
+                break;
+
+            case 'wpi_actions' :
+
+                if ( $invoice->is_draft() ) {
+                    return;
+                }
+
+                $url    = esc_url( $invoice->get_view_url() );
+                $print  = esc_attr__( 'Print invoice', 'invoicing' );
+                echo "&nbsp;<a href='$url' title='$print' target='_blank' style='color:#757575'><i class='fa fa-print' style='font-size: 1.4em;'></i></a>";
+
+                $url    = esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'getpaid-admin-action' => 'send_invoice',
+                                'invoice_id'           => $invoice->get_id()
+                            )
+                        ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                );
+
+                $send   = esc_attr__( 'Send invoice to customer', 'invoicing' );
+                echo "&nbsp;&nbsp;<a href='$url' title='$send' style='color:#757575'><i class='fa fa-envelope' style='font-size: 1.4em;'></i></a>";
+
+                break;
+        }
 
-				break;
+    }
 
-			case 'wpi_actions' :
-
-				if ( $invoice->is_draft() ) {
-					return;
-				}
-
-				$url    = esc_url( $invoice->get_view_url() );
-				$print  = esc_attr__( 'Print invoice', 'invoicing' );
-				echo "&nbsp;<a href='$url' title='$print' target='_blank' style='color:#757575'><i class='fa fa-print' style='font-size: 1.4em;'></i></a>";
+    /**
+     * Returns an array of payment forms table columns.
+     */
+    public static function payment_form_columns( $columns ) {
 
-				$url    = esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'getpaid-admin-action' => 'send_invoice',
-								'invoice_id'           => $invoice->get_id()
-							)
-						),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				);
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'title'             => __( 'Name', 'invoicing' ),
+            'shortcode'         => __( 'Shortcode', 'invoicing' ),
+            'earnings'          => __( 'Revenue', 'invoicing' ),
+            'refunds'           => __( 'Refunded', 'invoicing' ),
+            'items'             => __( 'Items', 'invoicing' ),
+            'date'              => __( 'Date', 'invoicing' ),
+        );
 
-				$send   = esc_attr__( 'Send invoice to customer', 'invoicing' );
-				echo "&nbsp;&nbsp;<a href='$url' title='$send' style='color:#757575'><i class='fa fa-envelope' style='font-size: 1.4em;'></i></a>";
+        return apply_filters( 'wpi_payment_form_table_columns', $columns );
 
-				break;
-		}
+    }
 
-	}
+    /**
+     * Displays payment form table columns.
+     */
+    public static function display_payment_form_columns( $column_name, $post_id ) {
 
-	/**
-	 * Returns an array of payment forms table columns.
-	 */
-	public static function payment_form_columns( $columns ) {
+        // Retrieve the payment form.
+        $form = new GetPaid_Payment_Form( $post_id );
 
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
-			'earnings'          => __( 'Revenue', 'invoicing' ),
-			'refunds'           => __( 'Refunded', 'invoicing' ),
-			'items'             => __( 'Items', 'invoicing' ),
-			'date'              => __( 'Date', 'invoicing' ),
-		);
+        switch ( $column_name ) {
 
-		return apply_filters( 'wpi_payment_form_table_columns', $columns );
+            case 'earnings' :
+                echo wpinv_price( wpinv_format_amount( $form->get_earned() ) );
+                break;
 
-	}
+            case 'refunds' :
+                echo wpinv_price( wpinv_format_amount( $form->get_refunded() ) );
+                break;
 
-	/**
-	 * Displays payment form table columns.
-	 */
-	public static function display_payment_form_columns( $column_name, $post_id ) {
+            case 'refunds' :
+                echo wpinv_price( wpinv_format_amount( $form->get_refunded() ) );
+                break;
 
-		// Retrieve the payment form.
-		$form = new GetPaid_Payment_Form( $post_id );
+            case 'shortcode' :
 
-		switch ( $column_name ) {
+                if ( $form->is_default() ) {
+                    echo '&mdash;';
+                } else {
+                    echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
+                }
 
-			case 'earnings' :
-				echo wpinv_price( wpinv_format_amount( $form->get_earned() ) );
-				break;
+                break;
 
-			case 'refunds' :
-				echo wpinv_price( wpinv_format_amount( $form->get_refunded() ) );
-				break;
+            case 'items' :
 
-			case 'refunds' :
-				echo wpinv_price( wpinv_format_amount( $form->get_refunded() ) );
-				break;
+                $items = $form->get_items();
 
-			case 'shortcode' :
+                if ( $form->is_default() || empty( $items ) ) {
+                    echo '&mdash;';
+                    return;
+                }
 
-				if ( $form->is_default() ) {
-					echo '&mdash;';
-				} else {
-					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
-				}
+                $_items = array();
 
-				break;
+                foreach ( $items as $item ) {
+                    $url = $item->get_edit_url();
 
-			case 'items' :
+                    if ( empty( $url ) ) {
+                        $_items[] = sanitize_text_field( $item->get_name() );
+                    } else {
+                        $_items[] = sprintf(
+                            '<a href="%s">%s</a>',
+                            esc_url( $url ),
+                            sanitize_text_field( $item->get_name() )
+                        );
+                    }
 
-				$items = $form->get_items();
+                }
 
-				if ( $form->is_default() || empty( $items ) ) {
-					echo '&mdash;';
-					return;
-				}
+                echo implode( '<br>', $_items );
 
-				$_items = array();
+                break;
 
-				foreach ( $items as $item ) {
-					$url = $item->get_edit_url();
+        }
 
-					if ( empty( $url ) ) {
-						$_items[] = sanitize_text_field( $item->get_name() );
-					} else {
-						$_items[] = sprintf(
-							'<a href="%s">%s</a>',
-							esc_url( $url ),
-							sanitize_text_field( $item->get_name() )
-						);
-					}
+    }
 
-				}
+    /**
+     * Filters post states.
+     */
+    public static function filter_payment_form_state( $post_states, $post ) {
 
-				echo implode( '<br>', $_items );
+        if ( 'wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID ) {
+            $post_states[ 'default_form' ] = __( 'Default Payment Form', 'invoicing' );
+        }
+	
+        return $post_states;
 
-				break;
+    }
 
-		}
+    /**
+     * Returns an array of coupon table columns.
+     */
+    public static function discount_columns( $columns ) {
+
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'title'             => __( 'Name', 'invoicing' ),
+            'code'              => __( 'Code', 'invoicing' ),
+            'amount'            => __( 'Amount', 'invoicing' ),
+            'usage'             => __( 'Usage / Limit', 'invoicing' ),
+            'start_date'        => __( 'Start Date', 'invoicing' ),
+            'expiry_date'       => __( 'Expiry Date', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_discount_table_columns', $columns );
+    }
 
-	}
+    /**
+     * Filters post states.
+     */
+    public static function filter_discount_state( $post_states, $post ) {
 
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_payment_form_state( $post_states, $post ) {
+        if ( 'wpi_discount' == $post->post_type ) {
 
-		if ( 'wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID ) {
-			$post_states[ 'default_form' ] = __( 'Default Payment Form', 'invoicing' );
-		}
-	
-		return $post_states;
+            $discount = new WPInv_Discount( $post );
 
-	}
+            $status = $discount->is_expired() ? 'expired' : $discount->get_status();
 
-	/**
-	 * Returns an array of coupon table columns.
-	 */
-	public static function discount_columns( $columns ) {
+            if ( $status != 'publish' ) {
+                return array(
+                    'discount_status' => wpinv_discount_status( $status ),
+                );
+            }
 
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'code'              => __( 'Code', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'usage'             => __( 'Usage / Limit', 'invoicing' ),
-			'start_date'        => __( 'Start Date', 'invoicing' ),
-			'expiry_date'       => __( 'Expiry Date', 'invoicing' ),
-		);
+            return array();
 
-		return apply_filters( 'wpi_discount_table_columns', $columns );
-	}
+        }
 
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_discount_state( $post_states, $post ) {
+        return $post_states;
 
-		if ( 'wpi_discount' == $post->post_type ) {
+    }
 
-			$discount = new WPInv_Discount( $post );
+    /**
+     * Returns an array of items table columns.
+     */
+    public static function item_columns( $columns ) {
+        global $wpinv_euvat;
+
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'title'             => __( 'Name', 'invoicing' ),
+            'price'             => __( 'Price', 'invoicing' ),
+            'vat_rule'          => __( 'VAT rule', 'invoicing' ),
+            'vat_class'         => __( 'VAT class', 'invoicing' ),
+            'type'              => __( 'Type', 'invoicing' ),
+            'shortcode'         => __( 'Shortcode', 'invoicing' ),
+        );
+
+        if ( ! $wpinv_euvat->allow_vat_rules() ) {
+            unset( $columns['vat_rule'] );
+        }
 
-			$status = $discount->is_expired() ? 'expired' : $discount->get_status();
+        if ( ! $wpinv_euvat->allow_vat_classes() ) {
+            unset( $columns['vat_class'] );
+        }
 
-			if ( $status != 'publish' ) {
-				return array(
-					'discount_status' => wpinv_discount_status( $status ),
-				);
-			}
+        return apply_filters( 'wpi_item_table_columns', $columns );
+    }
 
-			return array();
+    /**
+     * Returns an array of sortable items table columns.
+     */
+    public static function sortable_item_columns( $columns ) {
+
+        return array_merge(
+            $columns,
+            array(
+                'price'     => 'price',
+                'vat_rule'  => 'vat_rule',
+                'vat_class' => 'vat_class',
+                'type'      => 'type',
+            )
+        );
+
+    }
 
-		}
+    /**
+     * Displays items table columns.
+     */
+    public static function display_item_columns( $column_name, $post_id ) {
+        global $wpinv_euvat;
 
-		return $post_states;
+        $item = new WPInv_Item( $post_id );
 
-	}
+        switch ( $column_name ) {
 
-	/**
-	 * Returns an array of items table columns.
-	 */
-	public static function item_columns( $columns ) {
-		global $wpinv_euvat;
+            case 'price' :
 
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'price'             => __( 'Price', 'invoicing' ),
-			'vat_rule'          => __( 'VAT rule', 'invoicing' ),
-			'vat_class'         => __( 'VAT class', 'invoicing' ),
-			'type'              => __( 'Type', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
-		);
+                if ( ! $item->is_recurring() ) {
+                    echo $item->get_the_price();
+                    break;
+                }
 
-		if ( ! $wpinv_euvat->allow_vat_rules() ) {
-			unset( $columns['vat_rule'] );
-		}
+                $price = wp_sprintf(
+                    __( '%s / %s', 'invoicing' ),
+                    $item->get_the_price(),
+                    getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
+                );
 
-		if ( ! $wpinv_euvat->allow_vat_classes() ) {
-			unset( $columns['vat_class'] );
-		}
+                if ( $item->get_the_price() == $item->get_the_initial_price() ) {
+                    echo $price;
+                    break;
+                }
 
-		return apply_filters( 'wpi_item_table_columns', $columns );
-	}
+                echo $item->get_the_initial_price();
 
-	/**
-	 * Returns an array of sortable items table columns.
-	 */
-	public static function sortable_item_columns( $columns ) {
+                echo '<span class="meta">' . wp_sprintf( __( 'then %s', 'invoicing' ), $price )  .'</span>';
+                break;
 
-		return array_merge(
-			$columns,
-			array(
-				'price'     => 'price',
-				'vat_rule'  => 'vat_rule',
-				'vat_class' => 'vat_class',
-				'type'      => 'type',
-			)
-		);
+            case 'vat_rule' :
+                echo $wpinv_euvat->item_rule_label( $item->get_id() );
+                break;
 
-	}
+            case 'vat_class' :
+                echo $wpinv_euvat->item_class_label( $item->get_id() );
+                break;
 
-	/**
-	 * Displays items table columns.
-	 */
-	public static function display_item_columns( $column_name, $post_id ) {
-		global $wpinv_euvat;
+            case 'shortcode' :
+                echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
+                break;
 
-		$item = new WPInv_Item( $post_id );
+            case 'type' :
+                echo wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
+                break;
 
-		switch ( $column_name ) {
+        }
 
-			case 'price' :
+    }
 
-				if ( ! $item->is_recurring() ) {
-					echo $item->get_the_price();
-					break;
-				}
+    /**
+     * Lets users filter items using taxes.
+     */
+    public static function add_item_filters( $post_type ) {
+        $wpinv_euvat = getpaid_tax();
+
+        // Abort if we're not dealing with items.
+        if ( $post_type != 'wpi_item' ) {
+            return;
+        }
+
+        // Filter by vat rules.
+        if ( $wpinv_euvat->allow_vat_rules() ) {
+	
+            // Sanitize selected vat rule.
+            $vat_rule   = '';
+            $vat_rules  = $wpinv_euvat->get_rules();
+            if ( isset( $_GET['vat_rule'] ) ) {
+                $vat_rule   =  $_GET['vat_rule'];
+            }
+
+            // Filter by VAT rule.
+            echo wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All VAT rules', 'invoicing' )
+                        ),
+                        $vat_rules
+                    ),
+                    'name'             => 'vat_rule',
+                    'id'               => 'vat_rule',
+                    'selected'         => in_array( $vat_rule, array_keys( $vat_rules ) ) ? $vat_rule : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                    'class'            => 'gdmbx2-text-medium',
+                )
+            );
+
+            // Filter by VAT class.
+        }
 
-				$price = wp_sprintf(
-					__( '%s / %s', 'invoicing' ),
-					$item->get_the_price(),
-					getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
-				);
+        // Filter by vat class.
+        if ( $wpinv_euvat->allow_vat_classes() ) {
+	
+            // Sanitize selected vat rule.
+            $vat_class   = '';
+            $vat_classes = $wpinv_euvat->get_all_classes();
+            if ( isset( $_GET['vat_class'] ) ) {
+                $vat_class   =  $_GET['vat_class'];
+            }
+
+            echo wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All VAT classes', 'invoicing' )
+                        ),
+                        $vat_classes
+                    ),
+                    'name'             => 'vat_class',
+                    'id'               => 'vat_class',
+                    'selected'         => in_array( $vat_class, array_keys( $vat_classes ) ) ? $vat_class : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                    'class'            => 'gdmbx2-text-medium',
+                )
+            );
 
-				if ( $item->get_the_price() == $item->get_the_initial_price() ) {
-					echo $price;
-					break;
-				}
+        }
 
-				echo $item->get_the_initial_price();
+        // Filter by item type.
+        $type   = '';
+        if ( isset( $_GET['type'] ) ) {
+            $type   =  $_GET['type'];
+        }
 
-				echo '<span class="meta">' . wp_sprintf( __( 'then %s', 'invoicing' ), $price )  .'</span>';
-				break;
+        echo wpinv_html_select(
+            array(
+                'options'          => array_merge(
+                    array(
+                        '' => __( 'All item types', 'invoicing' )
+                    ),
+                    wpinv_get_item_types()
+                ),
+                'name'             => 'type',
+                'id'               => 'type',
+                'selected'         => in_array( $type, wpinv_item_types() ) ? $type : '',
+                'show_option_all'  => false,
+                'show_option_none' => false,
+                'class'            => 'gdmbx2-text-medium',
+            )
+        );
+
+    }
 
-			case 'vat_rule' :
-				echo $wpinv_euvat->item_rule_label( $item->get_id() );
-				break;
+    /**
+     * Filters the item query.
+     */
+    public static function filter_item_query( $query ) {
 
-			case 'vat_class' :
-				echo $wpinv_euvat->item_class_label( $item->get_id() );
-				break;
+        // modify the query only if it admin and main query.
+        if ( ! ( is_admin() && $query->is_main_query() ) ){ 
+            return $query;
+        }
 
-			case 'shortcode' :
-				echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
-				break;
+        // we want to modify the query for our items.
+        if ( 'wpi_item' != $query->query['post_type'] ){
+            return $query;
+        }
 
-			case 'type' :
-				echo wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
-				break;
+        if ( empty( $query->query_vars['meta_query'] ) ) {
+            $query->query_vars['meta_query'] = array();
+        }
 
-		}
-
-	}
-
-	/**
-	 * Lets users filter items using taxes.
-	 */
-	public static function add_item_filters( $post_type ) {
-		$wpinv_euvat = getpaid_tax();
-
-		// Abort if we're not dealing with items.
-		if ( $post_type != 'wpi_item' ) {
-			return;
-		}
-
-		// Filter by vat rules.
-		if ( $wpinv_euvat->allow_vat_rules() ) {
-	
-			// Sanitize selected vat rule.
-			$vat_rule   = '';
-			$vat_rules  = $wpinv_euvat->get_rules();
-			if ( isset( $_GET['vat_rule'] ) ) {
-				$vat_rule   =  $_GET['vat_rule'];
-			}
-
-			// Filter by VAT rule.
-			echo wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All VAT rules', 'invoicing' )
-						),
-						$vat_rules
-					),
-					'name'             => 'vat_rule',
-					'id'               => 'vat_rule',
-					'selected'         => in_array( $vat_rule, array_keys( $vat_rules ) ) ? $vat_rule : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-					'class'            => 'gdmbx2-text-medium',
-				)
-			);
-
-			// Filter by VAT class.
-		}
-
-		// Filter by vat class.
-		if ( $wpinv_euvat->allow_vat_classes() ) {
-	
-			// Sanitize selected vat rule.
-			$vat_class   = '';
-			$vat_classes = $wpinv_euvat->get_all_classes();
-			if ( isset( $_GET['vat_class'] ) ) {
-				$vat_class   =  $_GET['vat_class'];
-			}
-
-			echo wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All VAT classes', 'invoicing' )
-						),
-						$vat_classes
-					),
-					'name'             => 'vat_class',
-					'id'               => 'vat_class',
-					'selected'         => in_array( $vat_class, array_keys( $vat_classes ) ) ? $vat_class : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-					'class'            => 'gdmbx2-text-medium',
-				)
-			);
-
-		}
-
-		// Filter by item type.
-		$type   = '';
-		if ( isset( $_GET['type'] ) ) {
-			$type   =  $_GET['type'];
-		}
-
-		echo wpinv_html_select(
-			array(
-				'options'          => array_merge(
-					array(
-						'' => __( 'All item types', 'invoicing' )
-					),
-					wpinv_get_item_types()
-				),
-				'name'             => 'type',
-				'id'               => 'type',
-				'selected'         => in_array( $type, wpinv_item_types() ) ? $type : '',
-				'show_option_all'  => false,
-				'show_option_none' => false,
-				'class'            => 'gdmbx2-text-medium',
-			)
-		);
-
-	}
-
-	/**
-	 * Filters the item query.
-	 */
-	public static function filter_item_query( $query ) {
-
-		// modify the query only if it admin and main query.
-		if ( ! ( is_admin() && $query->is_main_query() ) ){ 
-			return $query;
-		}
-
-		// we want to modify the query for our items.
-		if ( 'wpi_item' != $query->query['post_type'] ){
-			return $query;
-		}
-
-		if ( empty( $query->query_vars['meta_query'] ) ) {
-			$query->query_vars['meta_query'] = array();
-		}
-
-		// Filter vat rule type
+        // Filter vat rule type
         if ( ! empty( $_GET['vat_rule'] ) ) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_rule',
@@ -647,94 +647,94 @@ 
                 'value'   => sanitize_text_field( $_GET['type'] ),
                 'compare' => '='
             );
-		}
-
-	}
-
-	/**
-	 * Reorders items.
-	 */
-	public static function reorder_items( $vars ) {
-		global $typenow;
-
-		if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
-			return $vars;
-		}
-
-		// By item type.
-		if ( 'type' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_type',
-					'orderby'  => 'meta_value'
-				)
-			);
-		}
-
-		// By vat class.
-		if ( 'vat_class' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_class',
-					'orderby'  => 'meta_value'
-				)
-			);
-		}
-
-		// By vat rule.
-		if ( 'vat_rule' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_rule',
-					'orderby'  => 'meta_value'
-				)
-			);
-		}
-
-		// By price.
-		if ( 'price' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_price',
-					'orderby'  => 'meta_value_num'
-				)
-			);
-		}
-
-		return $vars;
-
-	}
-
-	/**
-	 * Fired when deleting a post.
-	 */
-	public static function delete_post( $post_id ) {
-
-		switch ( get_post_type( $post_id ) ) {
-
-			case 'wpi_item' :
-				do_action( "getpaid_before_delete_item", new WPInv_Item( $post_id ) );
-				break;
-
-			case 'wpi_payment_form' :
-				do_action( "getpaid_before_delete_payment_form", new GetPaid_Payment_Form( $post_id ) );
-				break;
-
-			case 'wpi_discount' :
-				do_action( "getpaid_before_delete_discount", new WPInv_Discount( $post_id ) );
-				break;
-
-			case 'wpi_invoice' :
-				$invoice = new WPInv_Invoice( $post_id );
-				do_action( "getpaid_before_delete_invoice", $invoice );
-				$invoice->get_data_store()->delete_items( $invoice );
-				$invoice->get_data_store()->delete_special_fields( $invoice );
-				break;
-		}
-	}
+        }
+
+    }
+
+    /**
+     * Reorders items.
+     */
+    public static function reorder_items( $vars ) {
+        global $typenow;
+
+        if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
+            return $vars;
+        }
+
+        // By item type.
+        if ( 'type' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_type',
+                    'orderby'  => 'meta_value'
+                )
+            );
+        }
+
+        // By vat class.
+        if ( 'vat_class' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_class',
+                    'orderby'  => 'meta_value'
+                )
+            );
+        }
+
+        // By vat rule.
+        if ( 'vat_rule' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_rule',
+                    'orderby'  => 'meta_value'
+                )
+            );
+        }
+
+        // By price.
+        if ( 'price' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_price',
+                    'orderby'  => 'meta_value_num'
+                )
+            );
+        }
+
+        return $vars;
+
+    }
+
+    /**
+     * Fired when deleting a post.
+     */
+    public static function delete_post( $post_id ) {
+
+        switch ( get_post_type( $post_id ) ) {
+
+            case 'wpi_item' :
+                do_action( "getpaid_before_delete_item", new WPInv_Item( $post_id ) );
+                break;
+
+            case 'wpi_payment_form' :
+                do_action( "getpaid_before_delete_payment_form", new GetPaid_Payment_Form( $post_id ) );
+                break;
+
+            case 'wpi_discount' :
+                do_action( "getpaid_before_delete_discount", new WPInv_Discount( $post_id ) );
+                break;
+
+            case 'wpi_invoice' :
+                $invoice = new WPInv_Invoice( $post_id );
+                do_action( "getpaid_before_delete_invoice", $invoice );
+                $invoice->get_data_store()->delete_items( $invoice );
+                $invoice->get_data_store()->delete_special_fields( $invoice );
+                break;
+        }
+    }
 
 }

Spacing +193 added lines, -193 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Post types Admin Class
@@ -21,68 +21,68 @@ 
 		GetPaid_Metaboxes::init();
 
 		// Filter the post updated messages.
-		add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
+		add_filter('post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages');
 
 		// Filter post actions.
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
+		add_filter('post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2);
 
 		// Invoice table columns.
-		add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
-		add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
+		add_filter('manage_wpi_invoice_posts_columns', array(__CLASS__, 'invoice_columns'), 100);
+		add_action('manage_wpi_invoice_posts_custom_column', array(__CLASS__, 'display_invoice_columns'), 10, 2);
 
 		// Items table columns.
-		add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
-		add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
-		add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
-		add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
-		add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
+		add_filter('manage_wpi_item_posts_columns', array(__CLASS__, 'item_columns'), 100);
+		add_filter('manage_edit-wpi_item_sortable_columns', array(__CLASS__, 'sortable_item_columns'), 20);
+		add_action('manage_wpi_item_posts_custom_column', array(__CLASS__, 'display_item_columns'), 10, 2);
+		add_action('restrict_manage_posts', array(__CLASS__, 'add_item_filters'), 100);
+		add_action('parse_query', array(__CLASS__, 'filter_item_query'), 100);
+		add_action('request', array(__CLASS__, 'reorder_items'), 100);
 
 		// Payment forms columns.
-		add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
-		add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
+		add_filter('manage_wpi_payment_form_posts_columns', array(__CLASS__, 'payment_form_columns'), 100);
+		add_action('manage_wpi_payment_form_posts_custom_column', array(__CLASS__, 'display_payment_form_columns'), 10, 2);
+		add_filter('display_post_states', array(__CLASS__, 'filter_payment_form_state'), 10, 2);
 
 		// Discount table columns.
-		add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
+		add_filter('manage_wpi_discount_posts_columns', array(__CLASS__, 'discount_columns'), 100);
 
 		// Deleting posts.
-		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
+		add_action('delete_post', array(__CLASS__, 'delete_post'));
+		add_filter('display_post_states', array(__CLASS__, 'filter_discount_state'), 10, 2);
 	}
 
 	/**
 	 * Post updated messages.
 	 */
-	public static function post_updated_messages( $messages ) {
+	public static function post_updated_messages($messages) {
 		global $post;
 
 		$messages['wpi_discount'] = array(
 			0   => '',
-			1   => __( 'Discount updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Discount updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Discount updated.', 'invoicing' ),
-			7   => __( 'Discount saved.', 'invoicing' ),
-			8   => __( 'Discount submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Discount draft updated.', 'invoicing' ),
+			1   => __('Discount updated.', 'invoicing'),
+			2   => __('Custom field updated.', 'invoicing'),
+			3   => __('Custom field deleted.', 'invoicing'),
+			4   => __('Discount updated.', 'invoicing'),
+			5   => isset($_GET['revision']) ? wp_sprintf(__('Discount restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6   => __('Discount updated.', 'invoicing'),
+			7   => __('Discount saved.', 'invoicing'),
+			8   => __('Discount submitted.', 'invoicing'),
+			9   => wp_sprintf(__('Discount scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+			10  => __('Discount draft updated.', 'invoicing'),
 		);
 
 		$messages['wpi_payment_form'] = array(
 			0   => '',
-			1   => __( 'Payment Form updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Payment Form updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Payment Form updated.', 'invoicing' ),
-			7   => __( 'Payment Form saved.', 'invoicing' ),
-			8   => __( 'Payment Form submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Payment Form draft updated.', 'invoicing' ),
+			1   => __('Payment Form updated.', 'invoicing'),
+			2   => __('Custom field updated.', 'invoicing'),
+			3   => __('Custom field deleted.', 'invoicing'),
+			4   => __('Payment Form updated.', 'invoicing'),
+			5   => isset($_GET['revision']) ? wp_sprintf(__('Payment Form restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6   => __('Payment Form updated.', 'invoicing'),
+			7   => __('Payment Form saved.', 'invoicing'),
+			8   => __('Payment Form submitted.', 'invoicing'),
+			9   => wp_sprintf(__('Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+			10  => __('Payment Form draft updated.', 'invoicing'),
 		);
 
 		return $messages;
@@ -92,14 +92,14 @@ 
 	/**
 	 * Post row actions.
 	 */
-	public static function post_row_actions( $actions, $post ) {
+	public static function post_row_actions($actions, $post) {
 
-		$post = get_post( $post );
+		$post = get_post($post);
 
 		// We do not want to edit the default payment form.
-		if ( 'wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form() ) {
-			unset( $actions['trash'] );
-			unset( $actions['inline hide-if-no-js'] );
+		if ('wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form()) {
+			unset($actions['trash']);
+			unset($actions['inline hide-if-no-js']);
 		}
 
 		return $actions;
@@ -108,51 +108,51 @@ 
 	/**
 	 * Returns an array of invoice table columns.
 	 */
-	public static function invoice_columns( $columns ) {
+	public static function invoice_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'number'            => __( 'Invoice', 'invoicing' ),
-			'customer'          => __( 'Customer', 'invoicing' ),
-			'invoice_date'      => __( 'Date', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'recurring'         => __( 'Recurring', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'wpi_actions'       => __( 'Actions', 'invoicing' ),
+			'number'            => __('Invoice', 'invoicing'),
+			'customer'          => __('Customer', 'invoicing'),
+			'invoice_date'      => __('Date', 'invoicing'),
+			'amount'            => __('Amount', 'invoicing'),
+			'recurring'         => __('Recurring', 'invoicing'),
+			'status'            => __('Status', 'invoicing'),
+			'wpi_actions'       => __('Actions', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_invoice_table_columns', $columns );
+		return apply_filters('wpi_invoice_table_columns', $columns);
 	}
 
 	/**
 	 * Displays invoice table columns.
 	 */
-	public static function display_invoice_columns( $column_name, $post_id ) {
+	public static function display_invoice_columns($column_name, $post_id) {
 
-		$invoice = new WPInv_Invoice( $post_id );
+		$invoice = new WPInv_Invoice($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'invoice_date' :
-				$date_time = esc_attr( $invoice->get_created_date() );
-				$date      = getpaid_format_date_value( $date_time );
+				$date_time = esc_attr($invoice->get_created_date());
+				$date      = getpaid_format_date_value($date_time);
 				echo "<span title='$date_time'>$date</span>";
 				break;
 
 			case 'amount' :
 
 				$amount = $invoice->get_total();
-				$formated_amount = wpinv_price( wpinv_format_amount( $amount ), $invoice->get_currency() );
+				$formated_amount = wpinv_price(wpinv_format_amount($amount), $invoice->get_currency());
 
-				if ( $invoice->is_refunded() ) {
-					$refunded_amount = wpinv_price( wpinv_format_amount( 0 ), $invoice->get_currency() );
+				if ($invoice->is_refunded()) {
+					$refunded_amount = wpinv_price(wpinv_format_amount(0), $invoice->get_currency());
 					echo "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>";
 				} else {
 
 					$discount = $invoice->get_total_discount();
 
-					if ( ! empty( $discount ) ) {
-						$new_amount = wpinv_price( wpinv_format_amount( $amount + $discount ), $invoice->get_currency() );
+					if (!empty($discount)) {
+						$new_amount = wpinv_price(wpinv_format_amount($amount + $discount), $invoice->get_currency());
 						echo "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>";
 					} else {
 						echo $formated_amount;
@@ -163,13 +163,13 @@ 
 				break;
 
 			case 'status' :
-				$status       = sanitize_text_field( $invoice->get_status() );
-				$status_label = sanitize_text_field( $invoice->get_status_nicename() );
+				$status       = sanitize_text_field($invoice->get_status());
+				$status_label = sanitize_text_field($invoice->get_status_nicename());
 
 				// If it is paid, show the gateway title.
-				if ( $invoice->is_paid() ) {
-					$gateway = sanitize_text_field( $invoice->get_gateway_title() );
-					$gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), $gateway );
+				if ($invoice->is_paid()) {
+					$gateway = sanitize_text_field($invoice->get_gateway_title());
+					$gateway = wp_sprintf(esc_attr__('Paid via %s', 'invoicing'), $gateway);
 
 					echo "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>";
 				} else {
@@ -177,22 +177,22 @@ 
 				}
 
 				// If it is not paid, display the overdue and view status.
-				if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+				if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
 					// Invoice view status.
-					if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="'. esc_attr__( 'Viewed by Customer', 'invoicing' ).'"></i>';
+					if (wpinv_is_invoice_viewed($invoice->get_id())) {
+						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="' . esc_attr__('Viewed by Customer', 'invoicing') . '"></i>';
 					} else {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="'. esc_attr__( 'Not Viewed by Customer', 'invoicing' ).'"></i>';
+						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="' . esc_attr__('Not Viewed by Customer', 'invoicing') . '"></i>';
 					}
 
 					// Display the overview status.
-					if ( wpinv_get_option( 'overdue_active' ) ) {
+					if (wpinv_get_option('overdue_active')) {
 						$due_date = $invoice->get_due_date();
-						$fomatted = getpaid_format_date( $due_date );
+						$fomatted = getpaid_format_date($due_date);
 
-						if ( ! empty( $fomatted ) ) {
-							$date = wp_sprintf( __( 'Due %s', 'invoicing' ), $fomatted );
+						if (!empty($fomatted)) {
+							$date = wp_sprintf(__('Due %s', 'invoicing'), $fomatted);
 							echo "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>";
 						}
 					}
@@ -203,7 +203,7 @@ 
 
 			case 'recurring':
 
-				if ( $invoice->is_recurring() ) {
+				if ($invoice->is_recurring()) {
 					echo '<i class="fa fa-check" style="color:#43850a;"></i>';
 				} else {
 					echo '<i class="fa fa-times" style="color:#616161;"></i>';
@@ -212,9 +212,9 @@ 
 
 			case 'number' :
 
-				$edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
-				$invoice_number  = sanitize_text_field( $invoice->get_number() );
-				$invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+				$edit_link       = esc_url(get_edit_post_link($invoice->get_id()));
+				$invoice_number  = sanitize_text_field($invoice->get_number());
+				$invoice_details = esc_attr__('View Invoice Details', 'invoicing');
 
 				echo "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>";
 
@@ -224,13 +224,13 @@ 
 	
 				$customer_name = $invoice->get_user_full_name();
 	
-				if ( empty( $customer_name ) ) {
+				if (empty($customer_name)) {
 					$customer_name = $invoice->get_email();
 				}
 	
-				if ( ! empty( $customer_name ) ) {
-					$customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
-					$view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
+				if (!empty($customer_name)) {
+					$customer_details = esc_attr__('View Customer Details', 'invoicing');
+					$view_link        = esc_url(add_query_arg('user_id', $invoice->get_user_id(), admin_url('user-edit.php')));
 					echo "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>";
 				} else {
 					echo '<div>&mdash;</div>';
@@ -240,12 +240,12 @@ 
 
 			case 'wpi_actions' :
 
-				if ( $invoice->is_draft() ) {
+				if ($invoice->is_draft()) {
 					return;
 				}
 
-				$url    = esc_url( $invoice->get_view_url() );
-				$print  = esc_attr__( 'Print invoice', 'invoicing' );
+				$url    = esc_url($invoice->get_view_url());
+				$print  = esc_attr__('Print invoice', 'invoicing');
 				echo "&nbsp;<a href='$url' title='$print' target='_blank' style='color:#757575'><i class='fa fa-print' style='font-size: 1.4em;'></i></a>";
 
 				$url    = esc_url(
@@ -261,7 +261,7 @@ 
 					)
 				);
 
-				$send   = esc_attr__( 'Send invoice to customer', 'invoicing' );
+				$send = esc_attr__('Send invoice to customer', 'invoicing');
 				echo "&nbsp;&nbsp;<a href='$url' title='$send' style='color:#757575'><i class='fa fa-envelope' style='font-size: 1.4em;'></i></a>";
 
 				break;
@@ -272,50 +272,50 @@ 
 	/**
 	 * Returns an array of payment forms table columns.
 	 */
-	public static function payment_form_columns( $columns ) {
+	public static function payment_form_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
-			'earnings'          => __( 'Revenue', 'invoicing' ),
-			'refunds'           => __( 'Refunded', 'invoicing' ),
-			'items'             => __( 'Items', 'invoicing' ),
-			'date'              => __( 'Date', 'invoicing' ),
+			'title'             => __('Name', 'invoicing'),
+			'shortcode'         => __('Shortcode', 'invoicing'),
+			'earnings'          => __('Revenue', 'invoicing'),
+			'refunds'           => __('Refunded', 'invoicing'),
+			'items'             => __('Items', 'invoicing'),
+			'date'              => __('Date', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_payment_form_table_columns', $columns );
+		return apply_filters('wpi_payment_form_table_columns', $columns);
 
 	}
 
 	/**
 	 * Displays payment form table columns.
 	 */
-	public static function display_payment_form_columns( $column_name, $post_id ) {
+	public static function display_payment_form_columns($column_name, $post_id) {
 
 		// Retrieve the payment form.
-		$form = new GetPaid_Payment_Form( $post_id );
+		$form = new GetPaid_Payment_Form($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'earnings' :
-				echo wpinv_price( wpinv_format_amount( $form->get_earned() ) );
+				echo wpinv_price(wpinv_format_amount($form->get_earned()));
 				break;
 
 			case 'refunds' :
-				echo wpinv_price( wpinv_format_amount( $form->get_refunded() ) );
+				echo wpinv_price(wpinv_format_amount($form->get_refunded()));
 				break;
 
 			case 'refunds' :
-				echo wpinv_price( wpinv_format_amount( $form->get_refunded() ) );
+				echo wpinv_price(wpinv_format_amount($form->get_refunded()));
 				break;
 
 			case 'shortcode' :
 
-				if ( $form->is_default() ) {
+				if ($form->is_default()) {
 					echo '&mdash;';
 				} else {
-					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
+					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr($form->get_id()) . ']" style="width: 100%;" readonly/>';
 				}
 
 				break;
@@ -324,29 +324,29 @@ 
 
 				$items = $form->get_items();
 
-				if ( $form->is_default() || empty( $items ) ) {
+				if ($form->is_default() || empty($items)) {
 					echo '&mdash;';
 					return;
 				}
 
 				$_items = array();
 
-				foreach ( $items as $item ) {
+				foreach ($items as $item) {
 					$url = $item->get_edit_url();
 
-					if ( empty( $url ) ) {
-						$_items[] = sanitize_text_field( $item->get_name() );
+					if (empty($url)) {
+						$_items[] = sanitize_text_field($item->get_name());
 					} else {
 						$_items[] = sprintf(
 							'<a href="%s">%s</a>',
-							esc_url( $url ),
-							sanitize_text_field( $item->get_name() )
+							esc_url($url),
+							sanitize_text_field($item->get_name())
 						);
 					}
 
 				}
 
-				echo implode( '<br>', $_items );
+				echo implode('<br>', $_items);
 
 				break;
 
@@ -357,10 +357,10 @@ 
 	/**
 	 * Filters post states.
 	 */
-	public static function filter_payment_form_state( $post_states, $post ) {
+	public static function filter_payment_form_state($post_states, $post) {
 
-		if ( 'wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID ) {
-			$post_states[ 'default_form' ] = __( 'Default Payment Form', 'invoicing' );
+		if ('wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID) {
+			$post_states['default_form'] = __('Default Payment Form', 'invoicing');
 		}
 	
 		return $post_states;
@@ -370,35 +370,35 @@ 
 	/**
 	 * Returns an array of coupon table columns.
 	 */
-	public static function discount_columns( $columns ) {
+	public static function discount_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'code'              => __( 'Code', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'usage'             => __( 'Usage / Limit', 'invoicing' ),
-			'start_date'        => __( 'Start Date', 'invoicing' ),
-			'expiry_date'       => __( 'Expiry Date', 'invoicing' ),
+			'title'             => __('Name', 'invoicing'),
+			'code'              => __('Code', 'invoicing'),
+			'amount'            => __('Amount', 'invoicing'),
+			'usage'             => __('Usage / Limit', 'invoicing'),
+			'start_date'        => __('Start Date', 'invoicing'),
+			'expiry_date'       => __('Expiry Date', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_discount_table_columns', $columns );
+		return apply_filters('wpi_discount_table_columns', $columns);
 	}
 
 	/**
 	 * Filters post states.
 	 */
-	public static function filter_discount_state( $post_states, $post ) {
+	public static function filter_discount_state($post_states, $post) {
 
-		if ( 'wpi_discount' == $post->post_type ) {
+		if ('wpi_discount' == $post->post_type) {
 
-			$discount = new WPInv_Discount( $post );
+			$discount = new WPInv_Discount($post);
 
 			$status = $discount->is_expired() ? 'expired' : $discount->get_status();
 
-			if ( $status != 'publish' ) {
+			if ($status != 'publish') {
 				return array(
-					'discount_status' => wpinv_discount_status( $status ),
+					'discount_status' => wpinv_discount_status($status),
 				);
 			}
 
@@ -413,34 +413,34 @@ 
 	/**
 	 * Returns an array of items table columns.
 	 */
-	public static function item_columns( $columns ) {
+	public static function item_columns($columns) {
 		global $wpinv_euvat;
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'price'             => __( 'Price', 'invoicing' ),
-			'vat_rule'          => __( 'VAT rule', 'invoicing' ),
-			'vat_class'         => __( 'VAT class', 'invoicing' ),
-			'type'              => __( 'Type', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
+			'title'             => __('Name', 'invoicing'),
+			'price'             => __('Price', 'invoicing'),
+			'vat_rule'          => __('VAT rule', 'invoicing'),
+			'vat_class'         => __('VAT class', 'invoicing'),
+			'type'              => __('Type', 'invoicing'),
+			'shortcode'         => __('Shortcode', 'invoicing'),
 		);
 
-		if ( ! $wpinv_euvat->allow_vat_rules() ) {
-			unset( $columns['vat_rule'] );
+		if (!$wpinv_euvat->allow_vat_rules()) {
+			unset($columns['vat_rule']);
 		}
 
-		if ( ! $wpinv_euvat->allow_vat_classes() ) {
-			unset( $columns['vat_class'] );
+		if (!$wpinv_euvat->allow_vat_classes()) {
+			unset($columns['vat_class']);
 		}
 
-		return apply_filters( 'wpi_item_table_columns', $columns );
+		return apply_filters('wpi_item_table_columns', $columns);
 	}
 
 	/**
 	 * Returns an array of sortable items table columns.
 	 */
-	public static function sortable_item_columns( $columns ) {
+	public static function sortable_item_columns($columns) {
 
 		return array_merge(
 			$columns,
@@ -457,50 +457,50 @@ 
 	/**
 	 * Displays items table columns.
 	 */
-	public static function display_item_columns( $column_name, $post_id ) {
+	public static function display_item_columns($column_name, $post_id) {
 		global $wpinv_euvat;
 
-		$item = new WPInv_Item( $post_id );
+		$item = new WPInv_Item($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'price' :
 
-				if ( ! $item->is_recurring() ) {
+				if (!$item->is_recurring()) {
 					echo $item->get_the_price();
 					break;
 				}
 
 				$price = wp_sprintf(
-					__( '%s / %s', 'invoicing' ),
+					__('%s / %s', 'invoicing'),
 					$item->get_the_price(),
-					getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
+					getpaid_get_subscription_period_label($item->get_recurring_period(), $item->get_recurring_interval(), '')
 				);
 
-				if ( $item->get_the_price() == $item->get_the_initial_price() ) {
+				if ($item->get_the_price() == $item->get_the_initial_price()) {
 					echo $price;
 					break;
 				}
 
 				echo $item->get_the_initial_price();
 
-				echo '<span class="meta">' . wp_sprintf( __( 'then %s', 'invoicing' ), $price )  .'</span>';
+				echo '<span class="meta">' . wp_sprintf(__('then %s', 'invoicing'), $price) . '</span>';
 				break;
 
 			case 'vat_rule' :
-				echo $wpinv_euvat->item_rule_label( $item->get_id() );
+				echo $wpinv_euvat->item_rule_label($item->get_id());
 				break;
 
 			case 'vat_class' :
-				echo $wpinv_euvat->item_class_label( $item->get_id() );
+				echo $wpinv_euvat->item_class_label($item->get_id());
 				break;
 
 			case 'shortcode' :
-				echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
+				echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr($item->get_id()) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
 				break;
 
 			case 'type' :
-				echo wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
+				echo wpinv_item_type($item->get_id()) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
 				break;
 
 		}
@@ -510,22 +510,22 @@ 
 	/**
 	 * Lets users filter items using taxes.
 	 */
-	public static function add_item_filters( $post_type ) {
+	public static function add_item_filters($post_type) {
 		$wpinv_euvat = getpaid_tax();
 
 		// Abort if we're not dealing with items.
-		if ( $post_type != 'wpi_item' ) {
+		if ($post_type != 'wpi_item') {
 			return;
 		}
 
 		// Filter by vat rules.
-		if ( $wpinv_euvat->allow_vat_rules() ) {
+		if ($wpinv_euvat->allow_vat_rules()) {
 	
 			// Sanitize selected vat rule.
 			$vat_rule   = '';
 			$vat_rules  = $wpinv_euvat->get_rules();
-			if ( isset( $_GET['vat_rule'] ) ) {
-				$vat_rule   =  $_GET['vat_rule'];
+			if (isset($_GET['vat_rule'])) {
+				$vat_rule = $_GET['vat_rule'];
 			}
 
 			// Filter by VAT rule.
@@ -533,13 +533,13 @@ 
 				array(
 					'options'          => array_merge(
 						array(
-							'' => __( 'All VAT rules', 'invoicing' )
+							'' => __('All VAT rules', 'invoicing')
 						),
 						$vat_rules
 					),
 					'name'             => 'vat_rule',
 					'id'               => 'vat_rule',
-					'selected'         => in_array( $vat_rule, array_keys( $vat_rules ) ) ? $vat_rule : '',
+					'selected'         => in_array($vat_rule, array_keys($vat_rules)) ? $vat_rule : '',
 					'show_option_all'  => false,
 					'show_option_none' => false,
 					'class'            => 'gdmbx2-text-medium',
@@ -550,26 +550,26 @@ 
 		}
 
 		// Filter by vat class.
-		if ( $wpinv_euvat->allow_vat_classes() ) {
+		if ($wpinv_euvat->allow_vat_classes()) {
 	
 			// Sanitize selected vat rule.
 			$vat_class   = '';
 			$vat_classes = $wpinv_euvat->get_all_classes();
-			if ( isset( $_GET['vat_class'] ) ) {
-				$vat_class   =  $_GET['vat_class'];
+			if (isset($_GET['vat_class'])) {
+				$vat_class = $_GET['vat_class'];
 			}
 
 			echo wpinv_html_select(
 				array(
 					'options'          => array_merge(
 						array(
-							'' => __( 'All VAT classes', 'invoicing' )
+							'' => __('All VAT classes', 'invoicing')
 						),
 						$vat_classes
 					),
 					'name'             => 'vat_class',
 					'id'               => 'vat_class',
-					'selected'         => in_array( $vat_class, array_keys( $vat_classes ) ) ? $vat_class : '',
+					'selected'         => in_array($vat_class, array_keys($vat_classes)) ? $vat_class : '',
 					'show_option_all'  => false,
 					'show_option_none' => false,
 					'class'            => 'gdmbx2-text-medium',
@@ -579,22 +579,22 @@ 
 		}
 
 		// Filter by item type.
-		$type   = '';
-		if ( isset( $_GET['type'] ) ) {
-			$type   =  $_GET['type'];
+		$type = '';
+		if (isset($_GET['type'])) {
+			$type = $_GET['type'];
 		}
 
 		echo wpinv_html_select(
 			array(
 				'options'          => array_merge(
 					array(
-						'' => __( 'All item types', 'invoicing' )
+						'' => __('All item types', 'invoicing')
 					),
 					wpinv_get_item_types()
 				),
 				'name'             => 'type',
 				'id'               => 'type',
-				'selected'         => in_array( $type, wpinv_item_types() ) ? $type : '',
+				'selected'         => in_array($type, wpinv_item_types()) ? $type : '',
 				'show_option_all'  => false,
 				'show_option_none' => false,
 				'class'            => 'gdmbx2-text-medium',
@@ -606,45 +606,45 @@ 
 	/**
 	 * Filters the item query.
 	 */
-	public static function filter_item_query( $query ) {
+	public static function filter_item_query($query) {
 
 		// modify the query only if it admin and main query.
-		if ( ! ( is_admin() && $query->is_main_query() ) ){ 
+		if (!(is_admin() && $query->is_main_query())) { 
 			return $query;
 		}
 
 		// we want to modify the query for our items.
-		if ( 'wpi_item' != $query->query['post_type'] ){
+		if ('wpi_item' != $query->query['post_type']) {
 			return $query;
 		}
 
-		if ( empty( $query->query_vars['meta_query'] ) ) {
+		if (empty($query->query_vars['meta_query'])) {
 			$query->query_vars['meta_query'] = array();
 		}
 
 		// Filter vat rule type
-        if ( ! empty( $_GET['vat_rule'] ) ) {
+        if (!empty($_GET['vat_rule'])) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_rule',
-                'value'   => sanitize_text_field( $_GET['vat_rule'] ),
+                'value'   => sanitize_text_field($_GET['vat_rule']),
                 'compare' => '='
             );
         }
 
         // Filter vat class
-        if ( ! empty( $_GET['vat_class'] ) ) {
+        if (!empty($_GET['vat_class'])) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_class',
-                'value'   => sanitize_text_field( $_GET['vat_class'] ),
+                'value'   => sanitize_text_field($_GET['vat_class']),
                 'compare' => '='
             );
         }
 
         // Filter item type
-        if ( ! empty( $_GET['type'] ) ) {
+        if (!empty($_GET['type'])) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_type',
-                'value'   => sanitize_text_field( $_GET['type'] ),
+                'value'   => sanitize_text_field($_GET['type']),
                 'compare' => '='
             );
 		}
@@ -654,15 +654,15 @@ 
 	/**
 	 * Reorders items.
 	 */
-	public static function reorder_items( $vars ) {
+	public static function reorder_items($vars) {
 		global $typenow;
 
-		if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
+		if ('wpi_item' !== $typenow || empty($vars['orderby'])) {
 			return $vars;
 		}
 
 		// By item type.
-		if ( 'type' == $vars['orderby'] ) {
+		if ('type' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -673,7 +673,7 @@ 
 		}
 
 		// By vat class.
-		if ( 'vat_class' == $vars['orderby'] ) {
+		if ('vat_class' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -684,7 +684,7 @@ 
 		}
 
 		// By vat rule.
-		if ( 'vat_rule' == $vars['orderby'] ) {
+		if ('vat_rule' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -695,7 +695,7 @@ 
 		}
 
 		// By price.
-		if ( 'price' == $vars['orderby'] ) {
+		if ('price' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -712,27 +712,27 @@ 
 	/**
 	 * Fired when deleting a post.
 	 */
-	public static function delete_post( $post_id ) {
+	public static function delete_post($post_id) {
 
-		switch ( get_post_type( $post_id ) ) {
+		switch (get_post_type($post_id)) {
 
 			case 'wpi_item' :
-				do_action( "getpaid_before_delete_item", new WPInv_Item( $post_id ) );
+				do_action("getpaid_before_delete_item", new WPInv_Item($post_id));
 				break;
 
 			case 'wpi_payment_form' :
-				do_action( "getpaid_before_delete_payment_form", new GetPaid_Payment_Form( $post_id ) );
+				do_action("getpaid_before_delete_payment_form", new GetPaid_Payment_Form($post_id));
 				break;
 
 			case 'wpi_discount' :
-				do_action( "getpaid_before_delete_discount", new WPInv_Discount( $post_id ) );
+				do_action("getpaid_before_delete_discount", new WPInv_Discount($post_id));
 				break;
 
 			case 'wpi_invoice' :
-				$invoice = new WPInv_Invoice( $post_id );
-				do_action( "getpaid_before_delete_invoice", $invoice );
-				$invoice->get_data_store()->delete_items( $invoice );
-				$invoice->get_data_store()->delete_special_fields( $invoice );
+				$invoice = new WPInv_Invoice($post_id);
+				do_action("getpaid_before_delete_invoice", $invoice);
+				$invoice->get_data_store()->delete_items($invoice);
+				$invoice->get_data_store()->delete_special_fields($invoice);
 				break;
 		}
 	}

includes/payments/class-getpaid-payment-form-submission-refresh-prices.php

Indentation +139 added lines, -139 removed lines

@@ -12,185 +12,185 @@
  */
 class GetPaid_Payment_Form_Submission_Refresh_Prices {
 
-	/**
-	 * Contains the response for refreshing prices.
-	 * @var array
-	 */
-	public $response = array();
+    /**
+     * Contains the response for refreshing prices.
+     * @var array
+     */
+    public $response = array();
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		$this->response = array(
-			'submission_id' => $submission->id,
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        $this->response = array(
+            'submission_id' => $submission->id,
             'has_recurring' => $submission->has_recurring,
             'is_free'       => ! $submission->should_collect_payment_details(),
-		);
-
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
-
-	}
-
-	/**
-	 * Adds totals to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_totals( $submission ) {
-
-		$this->response = array_merge(
-			$this->response,
-			array(
-
-				'totals'        => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
-				),
+        );
+
+        $this->add_totals( $submission );
+        $this->add_texts( $submission );
+        $this->add_items( $submission );
+        $this->add_fees( $submission );
+        $this->add_discounts( $submission );
+        $this->add_taxes( $submission );
+
+    }
+
+    /**
+     * Adds totals to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_totals( $submission ) {
+
+        $this->response = array_merge(
+            $this->response,
+            array(
+
+                'totals'        => array(
+                    'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
+                    'discount'  => $submission->format_amount( $submission->get_discount() ),
+                    'fees'      => $submission->format_amount( $submission->get_fee() ),
+                    'tax'       => $submission->format_amount( $submission->get_tax() ),
+                    'total'     => $submission->format_amount( $submission->get_total() ),
+                ),
 	
-				'recurring'     => array(
-					'subtotal'  => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'     => $submission->format_amount( $submission->get_recurring_total() ),
-				),
+                'recurring'     => array(
+                    'subtotal'  => $submission->format_amount( $submission->get_recurring_subtotal() ),
+                    'discount'  => $submission->format_amount( $submission->get_recurring_discount() ),
+                    'fees'      => $submission->format_amount( $submission->get_recurring_fee() ),
+                    'tax'       => $submission->format_amount( $submission->get_recurring_tax() ),
+                    'total'     => $submission->format_amount( $submission->get_recurring_total() ),
+                ),
 
-			)
-		);
+            )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds texts to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_texts( $submission ) {
+    /**
+     * Adds texts to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_texts( $submission ) {
 
-		$payable = $submission->format_amount( $submission->get_total() );
+        $payable = $submission->format_amount( $submission->get_total() );
 
-		if ( $submission->has_recurring != 0 ) {
+        if ( $submission->has_recurring != 0 ) {
 
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
+            $recurring = new WPInv_Item( $submission->has_recurring );
+            $period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
 
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
-				$payable = "$payable / $period";
-			} else {
-				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)'),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
-					$period
-				);
-			}
+            if ( $submission->get_total() == $submission->get_recurring_total() ) {
+                $payable = "$payable / $period";
+            } else {
+                $payable = sprintf(
+                    __( '%1$s (renews at %2$s / %3$s)'),
+                    $submission->format_amount( $submission->get_total() ),
+                    $submission->format_amount( $submission->get_recurring_total() ),
+                    $period
+                );
+            }
 
-		}
+        }
 
-		$texts = array(
-			'.getpaid-checkout-total-payable' => $payable,
-		);
+        $texts = array(
+            '.getpaid-checkout-total-payable' => $payable,
+        );
 
-		foreach ( $submission->get_items() as $item_id => $item ) {
-			$texts[".item-$item_id .getpaid-item-initial-price"]   = $submission->format_amount( $item->get_sub_total() );
-			$texts[".item-$item_id .getpaid-item-recurring-price"] = $submission->format_amount( $item->get_recurring_sub_total() );
-		}
+        foreach ( $submission->get_items() as $item_id => $item ) {
+            $texts[".item-$item_id .getpaid-item-initial-price"]   = $submission->format_amount( $item->get_sub_total() );
+            $texts[".item-$item_id .getpaid-item-recurring-price"] = $submission->format_amount( $item->get_recurring_sub_total() );
+        }
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+        $this->response = array_merge( $this->response, array( 'texts' => $texts ) );
 
-	}
+    }
 
-	/**
-	 * Adds items to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_items( $submission ) {
+    /**
+     * Adds items to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_items( $submission ) {
 
-		// Add items.
-		$items = array();
+        // Add items.
+        $items = array();
 
         foreach ( $submission->get_items() as $item_id => $item ) {
-			$items["$item_id"] = $submission->format_amount( $item->get_sub_total() );
-		}
+            $items["$item_id"] = $submission->format_amount( $item->get_sub_total() );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'items' => $items )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'items' => $items )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds fees to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_fees( $submission ) {
+    /**
+     * Adds fees to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_fees( $submission ) {
 
-		$fees = array();
+        $fees = array();
 
         foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[$name] = $submission->format_amount( $data['initial_fee'] );
-		}
+            $fees[$name] = $submission->format_amount( $data['initial_fee'] );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'fees' => $fees )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'fees' => $fees )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds discounts to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_discounts( $submission ) {
+    /**
+     * Adds discounts to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_discounts( $submission ) {
 
-		$discounts = array();
+        $discounts = array();
 
         foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[$name] = $submission->format_amount( $data['initial_discount'] );
-		}
+            $discounts[$name] = $submission->format_amount( $data['initial_discount'] );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'discounts' => $discounts )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'discounts' => $discounts )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds taxes to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_taxes( $submission ) {
+    /**
+     * Adds taxes to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_taxes( $submission ) {
 
-		$taxes = array();
+        $taxes = array();
 
         foreach ( $submission->get_taxes() as $name => $data ) {
-			$taxes[$name] = $submission->format_amount( $data['initial_tax'] );
-		}
+            $taxes[$name] = $submission->format_amount( $data['initial_tax'] );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'taxes' => $taxes )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'taxes' => $taxes )
+        );
 
-	}
+    }
 
 }

Spacing +49 added lines, -49 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission refresh prices class
@@ -23,20 +23,20 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		$this->response = array(
 			'submission_id' => $submission->id,
             'has_recurring' => $submission->has_recurring,
-            'is_free'       => ! $submission->should_collect_payment_details(),
+            'is_free'       => !$submission->should_collect_payment_details(),
 		);
 
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
+		$this->add_totals($submission);
+		$this->add_texts($submission);
+		$this->add_items($submission);
+		$this->add_fees($submission);
+		$this->add_discounts($submission);
+		$this->add_taxes($submission);
 
 	}
 
@@ -45,26 +45,26 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_totals( $submission ) {
+	public function add_totals($submission) {
 
 		$this->response = array_merge(
 			$this->response,
 			array(
 
 				'totals'        => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
+					'subtotal'  => $submission->format_amount($submission->get_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_discount()),
+					'fees'      => $submission->format_amount($submission->get_fee()),
+					'tax'       => $submission->format_amount($submission->get_tax()),
+					'total'     => $submission->format_amount($submission->get_total()),
 				),
 	
 				'recurring'     => array(
-					'subtotal'  => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'     => $submission->format_amount( $submission->get_recurring_total() ),
+					'subtotal'  => $submission->format_amount($submission->get_recurring_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_recurring_discount()),
+					'fees'      => $submission->format_amount($submission->get_recurring_fee()),
+					'tax'       => $submission->format_amount($submission->get_recurring_tax()),
+					'total'     => $submission->format_amount($submission->get_recurring_total()),
 				),
 
 			)
@@ -77,22 +77,22 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_texts( $submission ) {
+	public function add_texts($submission) {
 
-		$payable = $submission->format_amount( $submission->get_total() );
+		$payable = $submission->format_amount($submission->get_total());
 
-		if ( $submission->has_recurring != 0 ) {
+		if ($submission->has_recurring != 0) {
 
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
+			$recurring = new WPInv_Item($submission->has_recurring);
+			$period    = getpaid_get_subscription_period_label($recurring->get_recurring_period(true), $recurring->get_recurring_interval(), '');
 
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
+			if ($submission->get_total() == $submission->get_recurring_total()) {
 				$payable = "$payable / $period";
 			} else {
 				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)'),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
+					__('%1$s (renews at %2$s / %3$s)'),
+					$submission->format_amount($submission->get_total()),
+					$submission->format_amount($submission->get_recurring_total()),
 					$period
 				);
 			}
@@ -103,12 +103,12 @@ 
 			'.getpaid-checkout-total-payable' => $payable,
 		);
 
-		foreach ( $submission->get_items() as $item_id => $item ) {
-			$texts[".item-$item_id .getpaid-item-initial-price"]   = $submission->format_amount( $item->get_sub_total() );
-			$texts[".item-$item_id .getpaid-item-recurring-price"] = $submission->format_amount( $item->get_recurring_sub_total() );
+		foreach ($submission->get_items() as $item_id => $item) {
+			$texts[".item-$item_id .getpaid-item-initial-price"]   = $submission->format_amount($item->get_sub_total());
+			$texts[".item-$item_id .getpaid-item-recurring-price"] = $submission->format_amount($item->get_recurring_sub_total());
 		}
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+		$this->response = array_merge($this->response, array('texts' => $texts));
 
 	}
 
@@ -117,18 +117,18 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_items( $submission ) {
+	public function add_items($submission) {
 
 		// Add items.
 		$items = array();
 
-        foreach ( $submission->get_items() as $item_id => $item ) {
-			$items["$item_id"] = $submission->format_amount( $item->get_sub_total() );
+        foreach ($submission->get_items() as $item_id => $item) {
+			$items["$item_id"] = $submission->format_amount($item->get_sub_total());
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'items' => $items )
+			array('items' => $items)
 		);
 
 	}
@@ -138,17 +138,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_fees( $submission ) {
+	public function add_fees($submission) {
 
 		$fees = array();
 
-        foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[$name] = $submission->format_amount( $data['initial_fee'] );
+        foreach ($submission->get_fees() as $name => $data) {
+			$fees[$name] = $submission->format_amount($data['initial_fee']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'fees' => $fees )
+			array('fees' => $fees)
 		);
 
 	}
@@ -158,17 +158,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_discounts( $submission ) {
+	public function add_discounts($submission) {
 
 		$discounts = array();
 
-        foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[$name] = $submission->format_amount( $data['initial_discount'] );
+        foreach ($submission->get_discounts() as $name => $data) {
+			$discounts[$name] = $submission->format_amount($data['initial_discount']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'discounts' => $discounts )
+			array('discounts' => $discounts)
 		);
 
 	}
@@ -178,17 +178,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_taxes( $submission ) {
+	public function add_taxes($submission) {
 
 		$taxes = array();
 
-        foreach ( $submission->get_taxes() as $name => $data ) {
-			$taxes[$name] = $submission->format_amount( $data['initial_tax'] );
+        foreach ($submission->get_taxes() as $name => $data) {
+			$taxes[$name] = $submission->format_amount($data['initial_tax']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'taxes' => $taxes )
+			array('taxes' => $taxes)
 		);
 
 	}

includes/payments/class-getpaid-checkout.php

Indentation +190 added lines, -190 removed lines

@@ -12,170 +12,170 @@ 
  */
 class GetPaid_Checkout {
 
-	/**
-	 * @var GetPaid_Payment_Form_Submission
-	 */
-	protected $payment_form_submission;
-
-	/**
-	 * Class constructor.
-	 * 
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-		$this->payment_form_submission = $submission;
-	}
-
-	/**
-	 * Processes the checkout.
-	 *
-	 */
-	public function process_checkout() {
-
-		// Validate the submission.
-		$this->validate_submission();
-
-		// Prepare the invoice.
-		$items      = $this->get_submission_items();
-		$invoice    = $this->get_submission_invoice();
-		$invoice    = $this->process_submission_invoice( $invoice, $items );
-		$prepared   = $this->prepare_submission_data_for_saving( $invoice );
-
-		// Save the invoice.
-		$invoice->recalculate_total();
+    /**
+     * @var GetPaid_Payment_Form_Submission
+     */
+    protected $payment_form_submission;
+
+    /**
+     * Class constructor.
+     * 
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+        $this->payment_form_submission = $submission;
+    }
+
+    /**
+     * Processes the checkout.
+     *
+     */
+    public function process_checkout() {
+
+        // Validate the submission.
+        $this->validate_submission();
+
+        // Prepare the invoice.
+        $items      = $this->get_submission_items();
+        $invoice    = $this->get_submission_invoice();
+        $invoice    = $this->process_submission_invoice( $invoice, $items );
+        $prepared   = $this->prepare_submission_data_for_saving( $invoice );
+
+        // Save the invoice.
+        $invoice->recalculate_total();
         $invoice->save();
 
-		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared );
-	}
+        // Send to the gateway.
+        $this->post_process_submission( $invoice, $prepared );
+    }
 
-	/**
-	 * Validates the submission.
-	 *
-	 */
-	protected function validate_submission() {
+    /**
+     * Validates the submission.
+     *
+     */
+    protected function validate_submission() {
 
-		$submission = $this->payment_form_submission;
-		$data       = $submission->get_data();
+        $submission = $this->payment_form_submission;
+        $data       = $submission->get_data();
 
-		// Do we have an error?
+        // Do we have an error?
         if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+            wp_send_json_error( $submission->last_error );
         }
 
-		// We need a billing email.
+        // We need a billing email.
         if ( ! $submission->has_billing_email() ) {
             wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
-		}
+        }
 
-		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
-		}
+        // Non-recurring gateways should not be allowed to process recurring invoices.
+        if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+        }
 
-		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not active', 'invoicing' ) );
-		}
+        // Ensure the gateway is active.
+        if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
+            wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not active', 'invoicing' ) );
+        }
 
-		// Clear any existing errors.
-		wpinv_clear_errors();
+        // Clear any existing errors.
+        wpinv_clear_errors();
 
-		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+        // Allow themes and plugins to hook to errors
+        do_action( 'getpaid_checkout_error_checks', $submission );
 
-		// Do we have any errors?
+        // Do we have any errors?
         if ( wpinv_get_errors() ) {
             wp_send_json_error( getpaid_get_errors_html() );
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Retrieves submission items.
-	 *
-	 * @return GetPaid_Form_Item[]
-	 */
-	protected function get_submission_items() {
+    /**
+     * Retrieves submission items.
+     *
+     * @return GetPaid_Form_Item[]
+     */
+    protected function get_submission_items() {
 
-		$items = $this->payment_form_submission->get_items();
+        $items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
         if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
             wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Retrieves submission invoice.
-	 *
-	 * @return WPInv_Invoice
-	 */
-	protected function get_submission_invoice() {
-		$submission = $this->payment_form_submission;
-
-		if ( ! $submission->has_invoice() ) {
-			$invoice = new WPInv_Invoice();
-			$invoice->created_via( 'payment_form' );
-			return $invoice;
         }
 
-		$invoice = $submission->get_invoice();
+        return $items;
+    }
+
+    /**
+     * Retrieves submission invoice.
+     *
+     * @return WPInv_Invoice
+     */
+    protected function get_submission_invoice() {
+        $submission = $this->payment_form_submission;
 
-		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
-		}
+        if ( ! $submission->has_invoice() ) {
+            $invoice = new WPInv_Invoice();
+            $invoice->created_via( 'payment_form' );
+            return $invoice;
+        }
 
-		return $invoice;
-	}
+        $invoice = $submission->get_invoice();
 
-	/**
-	 * Processes the submission invoice.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+        // Make sure that it is neither paid or refunded.
+        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+            wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+        }
 
-		$submission = $this->payment_form_submission;
-		$data       = $submission->get_data();
+        return $invoice;
+    }
 
-		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
+    /**
+     * Processes the submission invoice.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    protected function process_submission_invoice( $invoice, $items ) {
+
+        $submission = $this->payment_form_submission;
+        $data       = $submission->get_data();
+
+        // Set-up the invoice details.
+        $invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
+        $invoice->set_user_id( $this->get_submission_customer() );
+        $invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
         $invoice->set_items( $items );
         $invoice->set_fees( $submission->get_fees() );
         $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $data['wpi-gateway'] );
+        $invoice->set_discounts( $submission->get_discounts() );
+        $invoice->set_gateway( $data['wpi-gateway'] );
 
-		if ( $submission->has_discount_code() ) {
+        if ( $submission->has_discount_code() ) {
             $invoice->set_discount_code( $submission->get_discount_code() );
-		}
-
-		getpaid_maybe_add_default_address( $invoice );
-		return $invoice;
-	}
-
-	/**
-	 * Retrieves the submission's customer.
-	 *
-	 * @return int The customer id.
-	 */
-	protected function get_submission_customer() {
-		$submission = $this->payment_form_submission;
-
-		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
-			return $submission->get_invoice()->get_user_id();
-		}
-
-		// (Maybe) create the user.
+        }
+
+        getpaid_maybe_add_default_address( $invoice );
+        return $invoice;
+    }
+
+    /**
+     * Retrieves the submission's customer.
+     *
+     * @return int The customer id.
+     */
+    protected function get_submission_customer() {
+        $submission = $this->payment_form_submission;
+
+        // If this is an existing invoice...
+        if ( $submission->has_invoice() ) {
+            return $submission->get_invoice()->get_user_id();
+        }
+
+        // (Maybe) create the user.
         $user = get_current_user_id();
 
         if ( empty( $user ) ) {
@@ -192,31 +192,31 @@ 
 
         if ( is_numeric( $user ) ) {
             return $user;
-		}
+        }
 
-		return $user->ID;
+        return $user->ID;
 
-	}
+    }
 
-	/**
+    /**
      * Prepares submission data for saving to the database.
      *
-	 * @param WPInv_Invoice $invoice
+     * @param WPInv_Invoice $invoice
      */
     public function prepare_submission_data_for_saving( &$invoice ) {
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Prepared submission details.
+        // Prepared submission details.
         $prepared = array();
 
         // Raw submission details.
-		$data = $submission->get_data();
+        $data = $submission->get_data();
 		
-		// Loop throught the submitted details.
+        // Loop throught the submitted details.
         foreach ( $submission->get_payment_form()->get_elements() as $field ) {
 
-			// Skip premade fields.
+            // Skip premade fields.
             if ( ! empty( $field['premade'] ) ) {
                 continue;
             }
@@ -259,21 +259,21 @@ 
                 $prepared[ wpinv_clean( $label ) ] = wpinv_clean( $data[ $field['id'] ] );
             }
 
-		}
+        }
 		
-		return $prepared;
+        return $prepared;
 
-	}
+    }
 
-	/**
-	 * Confirms the submission is valid and send users to the gateway.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param array $prepared_payment_form_data
-	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data ) {
+    /**
+     * Confirms the submission is valid and send users to the gateway.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param array $prepared_payment_form_data
+     */
+    protected function post_process_submission( $invoice, $prepared_payment_form_data ) {
 
-		// Ensure the invoice exists.
+        // Ensure the invoice exists.
         if ( ! $invoice->exists() ) {
             wp_send_json_error( __( 'An error occured while saving your invoice.', 'invoicing' ) );
         }
@@ -281,65 +281,65 @@ 
         // Save payment form data.
         if ( ! empty( $prepared_payment_form_data ) ) {
             update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data );
-		}
+        }
 
-		// Backwards compatibility.
+        // Backwards compatibility.
         add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
 
-		$this->process_payment( $invoice );
+        $this->process_payment( $invoice );
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout();
+        wpinv_send_back_to_checkout();
 
-	}
+    }
 
-	/**
-	 * Processes the actual payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_payment( $invoice ) {
+    /**
+     * Processes the actual payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_payment( $invoice ) {
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$invoice->set_gateway( 'none' );
-			$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
-			$invoice->mark_paid();
-			wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
-		}
+        // No need to send free invoices to the gateway.
+        if ( $invoice->is_free() ) {
+            $invoice->set_gateway( 'none' );
+            $invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+            $invoice->mark_paid();
+            wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        }
 
-		// Clear any checkout errors.
-		wpinv_clear_errors();
+        // Clear any checkout errors.
+        wpinv_clear_errors();
 
-		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+        // Fires before sending to the gateway.
+        do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
 
-		// Allow the sumission data to be modified before it is sent to the gateway.
-		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+        // Allow the sumission data to be modified before it is sent to the gateway.
+        $submission_data    = $submission->get_data();
+        $submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
+        $submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
 
-		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support the invoice currency', 'invoicing' ) );
-		}
+        // Validate the currency.
+        if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
+            wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support the invoice currency', 'invoicing' ) );
+        }
 
-		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout();
-		}
+        // Check to see if we have any errors.
+        if ( wpinv_get_errors() ) {
+            wpinv_send_back_to_checkout();
+        }
 
-		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+        // Send info to the gateway for payment processing
+        do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
 
-		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+        // Backwards compatibility.
+        wpinv_send_to_gateway( $submission_gateway, $invoice );
 
-	}
+    }
 
-	/**
+    /**
      * Sends a redrect response to payment details.
      *
      */

Spacing +82 added lines, -82 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Checkout Class.
@@ -22,7 +22,7 @@ 
 	 * 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 		$this->payment_form_submission = $submission;
 	}
 
@@ -38,15 +38,15 @@ 
 		// Prepare the invoice.
 		$items      = $this->get_submission_items();
 		$invoice    = $this->get_submission_invoice();
-		$invoice    = $this->process_submission_invoice( $invoice, $items );
-		$prepared   = $this->prepare_submission_data_for_saving( $invoice );
+		$invoice    = $this->process_submission_invoice($invoice, $items);
+		$prepared   = $this->prepare_submission_data_for_saving($invoice);
 
 		// Save the invoice.
 		$invoice->recalculate_total();
         $invoice->save();
 
 		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared );
+		$this->post_process_submission($invoice, $prepared);
 	}
 
 	/**
@@ -59,34 +59,34 @@ 
 		$data       = $submission->get_data();
 
 		// Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+        if (!empty($submission->last_error)) {
+			wp_send_json_error($submission->last_error);
         }
 
 		// We need a billing email.
-        if ( ! $submission->has_billing_email() ) {
-            wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
+        if (!$submission->has_billing_email()) {
+            wp_send_json_error(__('Provide a valid billing email.', 'invoicing'));
 		}
 
 		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && $submission->has_recurring && !wpinv_gateway_support_subscription($data['wpi-gateway'])) {
+			wp_send_json_error(__('The selected payment gateway does not support subscription payments.', 'invoicing'));
 		}
 
 		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not active', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && !wpinv_is_gateway_active($data['wpi-gateway'])) {
+			wpinv_set_error('invalid_gateway', __('The selected payment gateway is not active', 'invoicing'));
 		}
 
 		// Clear any existing errors.
 		wpinv_clear_errors();
 
 		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+		do_action('getpaid_checkout_error_checks', $submission);
 
 		// Do we have any errors?
-        if ( wpinv_get_errors() ) {
-            wp_send_json_error( getpaid_get_errors_html() );
+        if (wpinv_get_errors()) {
+            wp_send_json_error(getpaid_get_errors_html());
 		}
 
 	}
@@ -101,8 +101,8 @@ 
 		$items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
-        if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
-            wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
+        if (empty($items) && !$this->payment_form_submission->has_fees()) {
+            wp_send_json_error(__('Please provide at least one item or amount.', 'invoicing'));
 		}
 
 		return $items;
@@ -116,17 +116,17 @@ 
 	protected function get_submission_invoice() {
 		$submission = $this->payment_form_submission;
 
-		if ( ! $submission->has_invoice() ) {
+		if (!$submission->has_invoice()) {
 			$invoice = new WPInv_Invoice();
-			$invoice->created_via( 'payment_form' );
+			$invoice->created_via('payment_form');
 			return $invoice;
         }
 
 		$invoice = $submission->get_invoice();
 
 		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+		if ($invoice->is_paid() || $invoice->is_refunded()) {
+			wp_send_json_error(__('This invoice has already been paid for.', 'invoicing'));
 		}
 
 		return $invoice;
@@ -139,26 +139,26 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+	protected function process_submission_invoice($invoice, $items) {
 
 		$submission = $this->payment_form_submission;
 		$data       = $submission->get_data();
 
 		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
-        $invoice->set_items( $items );
-        $invoice->set_fees( $submission->get_fees() );
-        $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $data['wpi-gateway'] );
-
-		if ( $submission->has_discount_code() ) {
-            $invoice->set_discount_code( $submission->get_discount_code() );
+		$invoice->set_email(sanitize_email($submission->get_billing_email()));
+		$invoice->set_user_id($this->get_submission_customer());
+		$invoice->set_payment_form(absint($submission->get_payment_form()->get_id()));
+        $invoice->set_items($items);
+        $invoice->set_fees($submission->get_fees());
+        $invoice->set_taxes($submission->get_taxes());
+		$invoice->set_discounts($submission->get_discounts());
+		$invoice->set_gateway($data['wpi-gateway']);
+
+		if ($submission->has_discount_code()) {
+            $invoice->set_discount_code($submission->get_discount_code());
 		}
 
-		getpaid_maybe_add_default_address( $invoice );
+		getpaid_maybe_add_default_address($invoice);
 		return $invoice;
 	}
 
@@ -171,26 +171,26 @@ 
 		$submission = $this->payment_form_submission;
 
 		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			return $submission->get_invoice()->get_user_id();
 		}
 
 		// (Maybe) create the user.
         $user = get_current_user_id();
 
-        if ( empty( $user ) ) {
-            $user = get_user_by( 'email', $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = get_user_by('email', $submission->get_billing_email());
         }
 
-        if ( empty( $user ) ) {
-            $user = wpinv_create_user( $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = wpinv_create_user($submission->get_billing_email());
         }
 
-        if ( is_wp_error( $user ) ) {
-            wp_send_json_error( $user->get_error_message() );
+        if (is_wp_error($user)) {
+            wp_send_json_error($user->get_error_message());
         }
 
-        if ( is_numeric( $user ) ) {
+        if (is_numeric($user)) {
             return $user;
 		}
 
@@ -203,7 +203,7 @@ 
      *
 	 * @param WPInv_Invoice $invoice
      */
-    public function prepare_submission_data_for_saving( &$invoice ) {
+    public function prepare_submission_data_for_saving(&$invoice) {
 
 		$submission = $this->payment_form_submission;
 
@@ -214,49 +214,49 @@ 
 		$data = $submission->get_data();
 		
 		// Loop throught the submitted details.
-        foreach ( $submission->get_payment_form()->get_elements() as $field ) {
+        foreach ($submission->get_payment_form()->get_elements() as $field) {
 
 			// Skip premade fields.
-            if ( ! empty( $field['premade'] ) ) {
+            if (!empty($field['premade'])) {
                 continue;
             }
 
             // If it is required and not set, abort.
-            if ( ! $submission->is_required_field_set( $field ) ) {
-                wp_send_json_error( __( 'Some required fields are not set.', 'invoicing' ) );
+            if (!$submission->is_required_field_set($field)) {
+                wp_send_json_error(__('Some required fields are not set.', 'invoicing'));
             }
 
             // Handle address fields.
-            if ( $field['type'] == 'address' ) {
+            if ($field['type'] == 'address') {
 
-                foreach ( $field['fields'] as $address_field ) {
+                foreach ($field['fields'] as $address_field) {
 
                     // skip if it is not visible.
-                    if ( empty( $address_field['visible'] ) ) {
+                    if (empty($address_field['visible'])) {
                         continue;
                     }
 
                     // If it is required and not set, abort
-                    if ( ! empty( $address_field['required'] ) && empty( $data[ $address_field['name'] ] ) ) {
-                        wp_send_json_error( __( 'Some required fields are not set.', 'invoicing' ) );
+                    if (!empty($address_field['required']) && empty($data[$address_field['name']])) {
+                        wp_send_json_error(__('Some required fields are not set.', 'invoicing'));
                     }
 
-                    if ( isset( $data[ $address_field['name'] ] ) ) {
-                        $name   = str_replace( 'wpinv_', '', $address_field['name'] );
+                    if (isset($data[$address_field['name']])) {
+                        $name   = str_replace('wpinv_', '', $address_field['name']);
                         $method = "set_$name";
-                        $invoice->$method( wpinv_clean( $data[ $address_field['name'] ] ) );
+                        $invoice->$method(wpinv_clean($data[$address_field['name']]));
                     }
 
                 }
 
-            } else if ( isset( $data[ $field['id'] ] ) ) {
+            } else if (isset($data[$field['id']])) {
                 $label = $field['id'];
 
-                if ( isset( $field['label'] ) ) {
+                if (isset($field['label'])) {
                     $label = $field['label'];
                 }
 
-                $prepared[ wpinv_clean( $label ) ] = wpinv_clean( $data[ $field['id'] ] );
+                $prepared[wpinv_clean($label)] = wpinv_clean($data[$field['id']]);
             }
 
 		}
@@ -271,22 +271,22 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param array $prepared_payment_form_data
 	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data ) {
+	protected function post_process_submission($invoice, $prepared_payment_form_data) {
 
 		// Ensure the invoice exists.
-        if ( ! $invoice->exists() ) {
-            wp_send_json_error( __( 'An error occured while saving your invoice.', 'invoicing' ) );
+        if (!$invoice->exists()) {
+            wp_send_json_error(__('An error occured while saving your invoice.', 'invoicing'));
         }
 
         // Save payment form data.
-        if ( ! empty( $prepared_payment_form_data ) ) {
-            update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data );
+        if (!empty($prepared_payment_form_data)) {
+            update_post_meta($invoice->get_id(), 'payment_form_data', $prepared_payment_form_data);
 		}
 
 		// Backwards compatibility.
-        add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
+        add_filter('wp_redirect', array($this, 'send_redirect_response'));
 
-		$this->process_payment( $invoice );
+		$this->process_payment($invoice);
 
         // If we are here, there was an error.
 		wpinv_send_back_to_checkout();
@@ -298,44 +298,44 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_payment( $invoice ) {
+	protected function process_payment($invoice) {
 
 		$submission = $this->payment_form_submission;
 
 		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$invoice->set_gateway( 'none' );
-			$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+		if ($invoice->is_free()) {
+			$invoice->set_gateway('none');
+			$invoice->add_note(__("This is a free invoice and won't be sent to the payment gateway", 'invoicing'), false, false, true);
 			$invoice->mark_paid();
-			wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+			wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 		}
 
 		// Clear any checkout errors.
 		wpinv_clear_errors();
 
 		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+		do_action('getpaid_checkout_before_gateway', $invoice, $submission);
 
 		// Allow the sumission data to be modified before it is sent to the gateway.
 		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+		$submission_gateway = apply_filters('getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice);
+		$submission_data    = apply_filters('getpaid_gateway_submission_data', $submission_data, $submission, $invoice);
 
 		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support the invoice currency', 'invoicing' ) );
+		if (!apply_filters("getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency())) {
+			wpinv_set_error('invalid_currency', __('The chosen payment gateway does not support the invoice currency', 'invoicing'));
 		}
 
 		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
+		if (wpinv_get_errors()) {
 			wpinv_send_back_to_checkout();
 		}
 
 		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+		do_action("getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission);
 
 		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+		wpinv_send_to_gateway($submission_gateway, $invoice);
 
 	}
 
@@ -343,9 +343,9 @@ 
      * Sends a redrect response to payment details.
      *
      */
-    public function send_redirect_response( $url ) {
-        $url = urlencode( $url );
-        wp_send_json_success( $url );
+    public function send_redirect_response($url) {
+        $url = urlencode($url);
+        wp_send_json_success($url);
     }
 
 }