AyeCode / invoicing

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

Spacing +130 added lines, -130 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -146,8 +146,8 @@ 
 		$this->state   = wpinv_get_default_state();
 
 		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( $_POST );
+		if (isset($_POST['getpaid_payment_form_submission'])) {
+			$this->load_data($_POST);
 		}
 
 	}
@@ -157,19 +157,19 @@ 
 	 *
 	 * @param array $data
 	 */
-	public function load_data( $data ) {
+	public function load_data($data) {
 
 		// Remove slashes from the submitted data...
-		$data       = wp_kses_post_deep( wp_unslash( $data ) );
+		$data       = wp_kses_post_deep(wp_unslash($data));
 
 		// Allow plugins to filter the data.
-		$data       = apply_filters( 'getpaid_submission_data', $data, $this );
+		$data       = apply_filters('getpaid_submission_data', $data, $this);
 
 		// Cache it...
 		$this->data = $data;
 
 		// Then generate a unique id from the data.
-		$this->id   = md5( wp_json_encode( $data ) );
+		$this->id   = md5(wp_json_encode($data));
 
 		// Finally, process the submission.
 		try {
@@ -179,30 +179,30 @@ 
 			$processors = apply_filters(
 				'getpaid_payment_form_submission_processors',
 				array(
-					array( $this, 'process_payment_form' ),
-					array( $this, 'process_invoice' ),
-					array( $this, 'process_fees' ),
-					array( $this, 'process_items' ),
-					array( $this, 'process_discount' ),
-					array( $this, 'process_taxes' ),
+					array($this, 'process_payment_form'),
+					array($this, 'process_invoice'),
+					array($this, 'process_fees'),
+					array($this, 'process_items'),
+					array($this, 'process_discount'),
+					array($this, 'process_taxes'),
 				),
 				$this		
 			);
 
-			foreach ( $processors as $processor ) {
-				call_user_func_array( $processor, array( &$this ) );
+			foreach ($processors as $processor) {
+				call_user_func_array($processor, array(&$this));
 			}
 
-		} catch( GetPaid_Payment_Exception $e ) {
+		} catch (GetPaid_Payment_Exception $e) {
 			$this->last_error      = $e->getMessage();
 			$this->last_error_code = $e->getErrorCode();
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->last_error      = $e->getMessage();
 			$this->last_error_code = $e->getCode();
 		}
 
 		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+		do_action_ref_array('getpaid_process_submission', array(&$this));
 
 	}
 
@@ -223,18 +223,18 @@ 
 	public function process_payment_form() {
 
 		// Every submission needs an active payment form.
-		if ( empty( $this->data['form_id'] ) ) {
-			throw new Exception( __( 'Missing payment form', 'invoicing' ) );
+		if (empty($this->data['form_id'])) {
+			throw new Exception(__('Missing payment form', 'invoicing'));
 		}
 
 		// Fetch the payment form.
-		$this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
+		$this->payment_form = new GetPaid_Payment_Form($this->data['form_id']);
 
-		if ( ! $this->payment_form->is_active() ) {
-			throw new Exception( __( 'Payment form not active', 'invoicing' ) );
+		if (!$this->payment_form->is_active()) {
+			throw new Exception(__('Payment form not active', 'invoicing'));
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_payment_form', array(&$this));
 	}
 
     /**
@@ -264,53 +264,53 @@ 
 	public function process_invoice() {
 
 		// Abort if there is no invoice.
-		if ( empty( $this->data['invoice_id'] ) ) {
+		if (empty($this->data['invoice_id'])) {
 			return;
 		}
 
 		// If the submission is for an existing invoice, ensure that it exists
 		// and that it is not paid for.
-		$invoice = wpinv_get_invoice( $this->data['invoice_id'] );
+		$invoice = wpinv_get_invoice($this->data['invoice_id']);
 
-        if ( empty( $invoice ) ) {
-			throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
+        if (empty($invoice)) {
+			throw new Exception(__('Invalid invoice', 'invoicing'));
 		}
 
-		if ( $invoice->is_paid() ) {
-			throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
+		if ($invoice->is_paid()) {
+			throw new Exception(__('This invoice is already paid for.', 'invoicing'));
 		}
 
 		$this->payment_form->invoice = $invoice;
-		if ( ! $this->payment_form->is_default() ) {
+		if (!$this->payment_form->is_default()) {
 
 			$items    = array();
 			$item_ids = array();
 	
-			foreach ( $invoice->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
+			foreach ($invoice->get_items() as $item) {
+				if (!in_array($item->get_id(), $item_ids)) {
 					$item_ids[] = $item->get_id();
 					$items[]    = $item;
 				}
 			}
 	
-			foreach ( $this->payment_form->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
+			foreach ($this->payment_form->get_items() as $item) {
+				if (!in_array($item->get_id(), $item_ids)) {
 					$item_ids[] = $item->get_id();
 					$items[]    = $item;
 				}
 			}
 	
-			$this->payment_form->set_items( $items );
+			$this->payment_form->set_items($items);
 	
 		} else {
-			$this->payment_form->set_items( $invoice->get_items() );
+			$this->payment_form->set_items($invoice->get_items());
 		}
 
 		$this->country = $invoice->get_country();
 		$this->state   = $invoice->get_state();
 		$this->invoice = $invoice;
 
-		do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_invoice', array(&$this));
 	}
 
 	/**
@@ -330,7 +330,7 @@ 
 	 * @return bool
 	 */
 	public function has_invoice() {
-		return ! empty( $this->invoice );
+		return !empty($this->invoice);
 	}
 
 	/*
@@ -349,13 +349,13 @@ 
 	 */
 	public function process_items() {
 
-		$processor = new GetPaid_Payment_Form_Submission_Items( $this );
+		$processor = new GetPaid_Payment_Form_Submission_Items($this);
 
-		foreach ( $processor->items as $item ) {
-			$this->add_item( $item );
+		foreach ($processor->items as $item) {
+			$this->add_item($item);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_items', array(&$this));
 	}
 
 	/**
@@ -364,20 +364,20 @@ 
 	 * @since 1.0.19
 	 * @param GetPaid_Form_Item $item
 	 */
-	public function add_item( $item ) {
+	public function add_item($item) {
 
 		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
+		if (!$item->can_purchase() || isset($this->items[$item->get_id()])) {
 			return;
 		}
 
 		// Each submission can only contain one recurring item.
-		if ( $item->is_recurring() ) {
+		if ($item->is_recurring()) {
 			$this->has_recurring = $item->get_id();
 		}
 
 		// Update the items and totals.
-		$this->items[ $item->get_id() ]         = $item;
+		$this->items[$item->get_id()]         = $item;
 		$this->totals['subtotal']['initial']   += $item->get_sub_total();
 		$this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
 
@@ -391,17 +391,17 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_item( $item_id ) {
+	public function remove_item($item_id) {
 
-		if ( isset( $this->items[ $item_id ] ) ) {
-			$this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
-			$this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
+		if (isset($this->items[$item_id])) {
+			$this->totals['subtotal']['initial']   -= $this->items[$item_id]->get_sub_total();
+			$this->totals['subtotal']['recurring'] -= $this->items[$item_id]->get_recurring_sub_total();
 
-			if ( $this->items[ $item_id ]->is_recurring() ) {
+			if ($this->items[$item_id]->is_recurring()) {
 				$this->has_recurring = 0;
 			}
 
-			unset( $this->items[ $item_id ] );
+			unset($this->items[$item_id]);
 		}
 
 	}
@@ -413,7 +413,7 @@ 
 	 */
 	public function get_subtotal() {
 
-		if ( wpinv_prices_include_tax() ) {
+		if (wpinv_prices_include_tax()) {
 			return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
 		}
 
@@ -427,7 +427,7 @@ 
 	 */
 	public function get_recurring_subtotal() {
 
-		if ( wpinv_prices_include_tax() ) {
+		if (wpinv_prices_include_tax()) {
 			return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
 		}
 
@@ -451,7 +451,7 @@ 
 	 * @return bool
 	 */
 	public function has_subscription_group() {
-		return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
+		return $this->has_recurring && getpaid_should_group_subscriptions($this) && 1 == count(getpaid_get_subscription_groups($this));
 	}
 
 	/**
@@ -461,7 +461,7 @@ 
 	 * @return bool
 	 */
 	public function has_multiple_subscription_groups() {
-		return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
+		return $this->has_recurring && 1 < count(getpaid_get_subscription_groups($this));
 	}
 
 	/*
@@ -481,39 +481,39 @@ 
 	public function process_taxes() {
 
 		// Abort if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
+		if (!$this->use_taxes()) {
 			return;
 		}
 
 		// If a custom country && state has been passed in, use it to calculate taxes.
-		$country = $this->get_field( 'wpinv_country', 'billing' );
-		if ( ! empty( $country ) ) {
+		$country = $this->get_field('wpinv_country', 'billing');
+		if (!empty($country)) {
 			$this->country = $country;
 		}
 
-		$state = $this->get_field( 'wpinv_state', 'billing' );
-		if ( ! empty( $state ) ) {
+		$state = $this->get_field('wpinv_state', 'billing');
+		if (!empty($state)) {
 			$this->state = $state;
 		}
 
 		// Confirm if the provided country and the ip country are similar.
-		$address_confirmed = $this->get_field( 'confirm-address' );
-		if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
-			throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
+		$address_confirmed = $this->get_field('confirm-address');
+		if (isset($_POST['billing']['country']) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty($address_confirmed)) {
+			throw new Exception(__('The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing'));
 		}
 
 		// Abort if the country is not taxable.
-		if ( ! wpinv_is_country_taxable( $this->country ) ) {
+		if (!wpinv_is_country_taxable($this->country)) {
 			return;
 		}
 
-		$processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
+		$processor = new GetPaid_Payment_Form_Submission_Taxes($this);
 
-		foreach ( $processor->taxes as $tax ) {
-			$this->add_tax( $tax );
+		foreach ($processor->taxes as $tax) {
+			$this->add_tax($tax);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_taxes', array(&$this));
 	}
 
 	/**
@@ -522,16 +522,16 @@ 
 	 * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
 	 * @since 1.0.19
 	 */
-	public function add_tax( $tax ) {
+	public function add_tax($tax) {
 
-		if ( wpinv_round_tax_per_tax_rate() ) {
-			$tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
-			$tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
+		if (wpinv_round_tax_per_tax_rate()) {
+			$tax['initial_tax']   = wpinv_round_amount($tax['initial_tax']);
+			$tax['recurring_tax'] = wpinv_round_amount($tax['recurring_tax']);
 		}
 
-		$this->taxes[ $tax['name'] ]         = $tax;
-		$this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
-		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
+		$this->taxes[$tax['name']]         = $tax;
+		$this->totals['taxes']['initial']   += wpinv_sanitize_amount($tax['initial_tax']);
+		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount($tax['recurring_tax']);
 
 	}
 
@@ -540,12 +540,12 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_tax( $tax_name ) {
+	public function remove_tax($tax_name) {
 
-		if ( isset( $this->taxes[ $tax_name ] ) ) {
-			$this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
-			$this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
-			unset( $this->taxes[ $tax_name ] );
+		if (isset($this->taxes[$tax_name])) {
+			$this->totals['taxes']['initial']   -= $this->taxes[$tax_name]['initial_tax'];
+			$this->totals['taxes']['recurring'] -= $this->taxes[$tax_name]['recurring_tax'];
+			unset($this->taxes[$tax_name]);
 		}
 
 	}
@@ -559,11 +559,11 @@ 
 
 		$use_taxes = wpinv_use_taxes();
 
-		if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
+		if ($this->has_invoice() && !$this->invoice->is_taxable()) {
 			$use_taxes = false;
 		}
 
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+		return apply_filters('getpaid_submission_use_taxes', $use_taxes, $this);
 
 	}
 
@@ -612,13 +612,13 @@ 
 
 		$initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
 		$recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
-		$processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
+		$processor        = new GetPaid_Payment_Form_Submission_Discount($this, $initial_total, $recurring_total);
 
-		foreach ( $processor->discounts as $discount ) {
-			$this->add_discount( $discount );
+		foreach ($processor->discounts as $discount) {
+			$this->add_discount($discount);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_discounts', array(&$this));
 	}
 
 	/**
@@ -627,10 +627,10 @@ 
 	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
 	 * @since 1.0.19
 	 */
-	public function add_discount( $discount ) {
-		$this->discounts[ $discount['name'] ]   = $discount;
-		$this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
-		$this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
+	public function add_discount($discount) {
+		$this->discounts[$discount['name']]   = $discount;
+		$this->totals['discount']['initial']   += wpinv_sanitize_amount($discount['initial_discount']);
+		$this->totals['discount']['recurring'] += wpinv_sanitize_amount($discount['recurring_discount']);
 	}
 
 	/**
@@ -638,12 +638,12 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_discount( $name ) {
+	public function remove_discount($name) {
 
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
-			$this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
-			unset( $this->discounts[ $name ] );
+		if (isset($this->discounts[$name])) {
+			$this->totals['discount']['initial']   -= $this->discounts[$name]['initial_discount'];
+			$this->totals['discount']['recurring'] -= $this->discounts[$name]['recurring_discount'];
+			unset($this->discounts[$name]);
 		}
 
 	}
@@ -655,7 +655,7 @@ 
 	 * @return bool
 	 */
 	public function has_discount_code() {
-		return ! empty( $this->discounts['discount_code'] );
+		return !empty($this->discounts['discount_code']);
 	}
 
 	/**
@@ -712,13 +712,13 @@ 
 	 */
 	public function process_fees() {
 
-		$fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
+		$fees_processor = new GetPaid_Payment_Form_Submission_Fees($this);
 
-		foreach ( $fees_processor->fees as $fee ) {
-			$this->add_fee( $fee );
+		foreach ($fees_processor->fees as $fee) {
+			$this->add_fee($fee);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_fees', array(&$this));
 	}
 
 	/**
@@ -727,17 +727,17 @@ 
 	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
 	 * @since 1.0.19
 	 */
-	public function add_fee( $fee ) {
+	public function add_fee($fee) {
 
-		if ( $fee['name'] == 'shipping' ) {
-			$this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+		if ($fee['name'] == 'shipping') {
+			$this->totals['shipping']['initial']   += wpinv_sanitize_amount($fee['initial_fee']);
+			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount($fee['recurring_fee']);
 			return;
 		}
 
-		$this->fees[ $fee['name'] ]         = $fee;
-		$this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-		$this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+		$this->fees[$fee['name']]         = $fee;
+		$this->totals['fees']['initial']   += wpinv_sanitize_amount($fee['initial_fee']);
+		$this->totals['fees']['recurring'] += wpinv_sanitize_amount($fee['recurring_fee']);
 
 	}
 
@@ -746,15 +746,15 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_fee( $name ) {
+	public function remove_fee($name) {
 
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
-			$this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
-			unset( $this->fees[ $name ] );
+		if (isset($this->fees[$name])) {
+			$this->totals['fees']['initial']   -= $this->fees[$name]['initial_fee'];
+			$this->totals['fees']['recurring'] -= $this->fees[$name]['recurring_fee'];
+			unset($this->fees[$name]);
 		}
 
-		if ( 'shipping' == $name ) {
+		if ('shipping' == $name) {
 			$this->totals['shipping']['initial']   = 0;
 			$this->totals['shipping']['recurring'] = 0;
 		}
@@ -795,7 +795,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function has_fees() {
-		return count( $this->fees ) !== 0;
+		return count($this->fees) !== 0;
 	}
 
 	/*
@@ -831,7 +831,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function has_shipping() {
-		return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
+		return apply_filters('getpaid_payment_form_has_shipping', false, $this);
 	}
 
 	/**
@@ -841,7 +841,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function is_initial_fetch() {
-		return empty( $this->data['initial_state'] );
+		return empty($this->data['initial_state']);
 	}
 
 	/**
@@ -851,7 +851,7 @@ 
 	 */
 	public function get_total() {
 		$total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -861,7 +861,7 @@ 
 	 */
 	public function get_recurring_total() {
 		$total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -873,12 +873,12 @@ 
 		$initial   = $this->get_total();
 		$recurring = $this->get_recurring_total();
 
-		if ( $this->has_recurring == 0 ) {
+		if ($this->has_recurring == 0) {
 			$recurring = 0;
 		}
 
 		$collect = $initial > 0 || $recurring > 0;
-		return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this  );
+		return apply_filters('getpaid_submission_should_collect_payment_details', $collect, $this);
 	}
 
 	/**
@@ -887,7 +887,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function get_billing_email() {
-		return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this  );
+		return apply_filters('getpaid_get_submission_billing_email', $this->get_field('billing_email'), $this);
 	}
 
 	/**
@@ -897,7 +897,7 @@ 
 	 */
 	public function has_billing_email() {
 		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email ) && is_email( $billing_email );
+		return !empty($billing_email) && is_email($billing_email);
 	}
 
 	/**
@@ -927,8 +927,8 @@ 
 	 * @since 1.0.19
 	 * @return mixed|null
 	 */
-	public function get_field( $field, $sub_array_key = null ) {
-		return getpaid_get_array_field( $this->data, $field, $sub_array_key );
+	public function get_field($field, $sub_array_key = null) {
+		return getpaid_get_array_field($this->data, $field, $sub_array_key);
 	}
 
 	/**
@@ -936,8 +936,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+	public function is_required_field_set($field) {
+		return empty($field['required']) || !empty($this->data[$field['id']]);
 	}
 
 	/**
@@ -945,8 +945,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function format_amount( $amount ) {
-		return wpinv_price( $amount, $this->get_currency() );
+	public function format_amount($amount) {
+		return wpinv_price($amount, $this->get_currency());
 	}
 
 }

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

Spacing +19 added lines, -19 removed lines

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

includes/payments/class-getpaid-checkout.php

Spacing +134 added lines, -134 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,22 +38,22 @@ 
 		// Prepare the invoice.
 		$items      = $this->get_submission_items();
 		$invoice    = $this->get_submission_invoice();
-		$invoice    = $this->process_submission_invoice( $invoice, $items );
+		$invoice    = $this->process_submission_invoice($invoice, $items);
 		$prepared   = $this->prepare_submission_data_for_saving();
 
-		$this->prepare_billing_info( $invoice );
+		$this->prepare_billing_info($invoice);
 
-		$shipping   = $this->prepare_shipping_info( $invoice );
+		$shipping = $this->prepare_shipping_info($invoice);
 
 		// Save the invoice.
-		$invoice->set_is_viewed( true );
+		$invoice->set_is_viewed(true);
 		$invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+		do_action('getpaid_checkout_invoice_updated', $invoice);
 
 		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
+		$this->post_process_submission($invoice, $prepared, $shipping);
 	}
 
 	/**
@@ -66,34 +66,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'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && !wpinv_is_gateway_active($data['wpi-gateway'])) {
+			wp_send_json_error(__('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());
 		}
 
 	}
@@ -108,8 +108,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;
@@ -123,17 +123,17 @@ 
 	protected function get_submission_invoice() {
 		$submission = $this->payment_form_submission;
 
-		if ( ! $submission->has_invoice() ) {
+		if (!$submission->has_invoice()) {
 			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
+			$invoice->set_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;
@@ -146,33 +146,33 @@ 
 	 * @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;
 
 		// 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( $submission->get_field( 'wpi-gateway' ) );
-		$invoice->set_currency( $submission->get_currency() );
-
-		if ( $submission->has_shipping() ) {
-			$invoice->set_shipping( $submission->get_shipping() );
+		$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($submission->get_field('wpi-gateway'));
+		$invoice->set_currency($submission->get_currency());
+
+		if ($submission->has_shipping()) {
+			$invoice->set_shipping($submission->get_shipping());
 		}
 
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
+		$address_confirmed = $submission->get_field('confirm-address');
+		$invoice->set_address_confirmed(!empty($address_confirmed));
 
-		if ( $submission->has_discount_code() ) {
-            $invoice->set_discount_code( $submission->get_discount_code() );
+		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;
 	}
 
@@ -185,33 +185,33 @@ 
 		$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());
 
 			// (Maybe) send new user notification.
-			$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-			if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ), $user ) ) {
-				wp_send_new_user_notifications( $user, 'user' );
+			$should_send_notification = wpinv_get_option('disable_new_user_emails');
+			if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification), $user)) {
+				wp_send_new_user_notifications($user, 'user');
 			}
 
         }
 
-        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;
 		}
 
@@ -235,24 +235,24 @@ 
 		);
 
         // Raw submission details.
-		$data     = $submission->get_data();
+		$data = $submission->get_data();
 
 		// Loop through 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;
             }
 
 			// Ensure address is provided.
-			if ( $field['type'] == 'address' ) {
-                $address_type = isset( $field['address_type'] ) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
+			if ($field['type'] == 'address') {
+                $address_type = isset($field['address_type']) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
 
-				foreach ( $field['fields'] as $address_field ) {
+				foreach ($field['fields'] as $address_field) {
 
-					if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) {
-						wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+					if (!empty($address_field['visible']) && !empty($address_field['required']) && '' === trim($_POST[$address_type][$address_field['name']])) {
+						wp_send_json_error(__('Please fill all required fields.', 'invoicing'));
 					}
 
 				}
@@ -260,49 +260,49 @@ 
             }
 
             // If it is required and not set, abort.
-            if ( ! $submission->is_required_field_set( $field ) ) {
-                wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+            if (!$submission->is_required_field_set($field)) {
+                wp_send_json_error(__('Please fill all required fields.', 'invoicing'));
             }
 
             // Handle misc fields.
-            if ( isset( $data[ $field['id'] ] ) ) {
+            if (isset($data[$field['id']])) {
 
 				// Uploads.
-				if ( $field['type'] == 'file_upload' ) {
-					$max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
+				if ($field['type'] == 'file_upload') {
+					$max_file_num = empty($field['max_file_num']) ? 1 : absint($field['max_file_num']);
 
-					if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
-						wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
+					if (count($data[$field['id']]) > $max_file_num) {
+						wp_send_json_error(__('Maximum number of allowed files exceeded.', 'invoicing'));
 					}
 
 					$value = array();
 
-					foreach ( $data[ $field['id'] ] as $url => $name ) {
+					foreach ($data[$field['id']] as $url => $name) {
 						$value[] = sprintf(
 							'<a href="%s" target="_blank">%s</a>',
-							esc_url_raw( $url ),
-							esc_html( $name )
+							esc_url_raw($url),
+							esc_html($name)
 						);
 					}
 
-					$value = implode( ' | ', $value );
+					$value = implode(' | ', $value);
 
-				} else if ( $field['type'] == 'checkbox' ) {
-					$value = isset( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
+				} else if ($field['type'] == 'checkbox') {
+					$value = isset($data[$field['id']]) ? __('Yes', 'invoicing') : __('No', 'invoicing');
 				} else {
-					$value = wp_kses_post( $data[ $field['id'] ] );
+					$value = wp_kses_post($data[$field['id']]);
 				}
 
                 $label = $field['id'];
 
-                if ( isset( $field['label'] ) ) {
+                if (isset($field['label'])) {
                     $label = $field['label'];
                 }
 
-				if ( ! empty( $field['add_meta'] ) ) {
-					$prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+				if (!empty($field['add_meta'])) {
+					$prepared['meta'][wpinv_clean($label)] = wp_kses_post_deep($value);
 				}
-				$prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+				$prepared['all'][wpinv_clean($label)] = wp_kses_post_deep($value);
 
             }
 
@@ -319,30 +319,30 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param string $type
      */
-    public function prepare_address_details( $invoice, $type = 'billing' ) {
+    public function prepare_address_details($invoice, $type = 'billing') {
 
 		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
+		$type     = sanitize_key($type);
 		$address  = array();
 		$prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
+		if (!empty($data[$type])) {
+			$address = $data[$type];
 		}
 
 		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+		foreach ($address as $key => $value) {
+			$key             = sanitize_key($key);
+			$key             = str_replace('wpinv_', '', $key);
+			$value           = wpinv_clean($value);
+			$prepared[$key] = apply_filters("getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice);
 		}
 
 		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+		$prepared = apply_filters("getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice);
 
 		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+		return array_filter($prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY);
 
 	}
 
@@ -352,12 +352,12 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_billing_info( &$invoice ) {
+    protected function prepare_billing_info(&$invoice) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+		$billing_address = $this->prepare_address_details($invoice, 'billing');
 
 		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+		$invoice->set_props($billing_address);
 
 	}
 
@@ -367,15 +367,15 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_shipping_info( $invoice ) {
+    protected function prepare_shipping_info($invoice) {
 
 		$data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
+		if (empty($data['same-shipping-address'])) {
+			return $this->prepare_address_details($invoice, 'shipping');
 		}
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+		return $this->prepare_address_details($invoice, 'billing');
 
 	}
 
@@ -386,42 +386,42 @@ 
 	 * @param array $prepared_payment_form_data
 	 * @param array $shipping
 	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+	protected function post_process_submission($invoice, $prepared_payment_form_data, $shipping) {
 
 		// Ensure the invoice exists.
-        if ( ! $invoice->exists() ) {
-            wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
+        if (!$invoice->exists()) {
+            wp_send_json_error(__('An error occured while saving your invoice. Please try again.', 'invoicing'));
         }
 
 		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
-        delete_post_meta( $invoice->get_id(), 'payment_form_data' );
-		delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
-		if ( ! empty( $prepared_payment_form_data ) ) {
+		$prepared_payment_form_data = apply_filters('getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice);
+        delete_post_meta($invoice->get_id(), 'payment_form_data');
+		delete_post_meta($invoice->get_id(), 'additional_meta_data');
+		if (!empty($prepared_payment_form_data)) {
 
-			if ( ! empty( $prepared_payment_form_data['all'] ) ) {
-				update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
+			if (!empty($prepared_payment_form_data['all'])) {
+				update_post_meta($invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all']);
 			}
 
-			if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
-				update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
+			if (!empty($prepared_payment_form_data['meta'])) {
+				update_post_meta($invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta']);
 			}
 
 		}
 
 		// Save payment form data.
-		$shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
-        if ( ! empty( $shipping ) ) {
-            update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
+		$shipping = apply_filters('getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission);
+        if (!empty($shipping)) {
+            update_post_meta($invoice->get_id(), 'shipping_address', $shipping);
 		}
 
 		// 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( $invoice );
+		wpinv_send_back_to_checkout($invoice);
 
 	}
 
@@ -430,41 +430,41 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_payment( $invoice ) {
+	protected function process_payment($invoice) {
 
 		// Clear any checkout errors.
 		wpinv_clear_errors();
 
 		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
+		if ($invoice->is_free()) {
+			$this->process_free_payment($invoice);
 		}
 
 		$submission = $this->payment_form_submission;
 
 		// 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 this 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 this currency', 'invoicing'));
 		}
 
 		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
+		if (wpinv_get_errors()) {
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 		// 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);
 
 	}
 
@@ -473,12 +473,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_free_payment( $invoice ) {
+	protected function process_free_payment($invoice) {
 
-		$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->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()));
 
 	}
 
@@ -486,9 +486,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);
     }
 
 }

includes/wpinv-address-functions.php

Spacing +145 added lines, -145 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+	$country = wpinv_get_option('default_country', 'UK');
 
-	return apply_filters( 'wpinv_default_country', $country );
+	return apply_filters('wpinv_default_country', $country);
 }
 
 /**
@@ -23,8 +23,8 @@ 
  *
  * @return string
  */
-function getpaid_get_ip_country( $ip_address = '' ) {
-    $country = GetPaid_Geolocation::geolocate_ip( $ip_address, true );
+function getpaid_get_ip_country($ip_address = '') {
+    $country = GetPaid_Geolocation::geolocate_ip($ip_address, true);
     return $country['country'];
 }
 
@@ -34,59 +34,59 @@ 
  * @param string $country The country code to sanitize
  * @return array
  */
-function wpinv_sanitize_country( $country ) {
+function wpinv_sanitize_country($country) {
 
 	// Enure the country is specified
-    if ( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
-    return trim( wpinv_utf8_strtoupper( $country ) );
+    return trim(wpinv_utf8_strtoupper($country));
 
 }
 
-function wpinv_is_base_country( $country ) {
+function wpinv_is_base_country($country) {
     $base_country = wpinv_get_default_country();
     
-    if ( $base_country === 'UK' ) {
+    if ($base_country === 'UK') {
         $base_country = 'GB';
     }
-    if ( $country == 'UK' ) {
+    if ($country == 'UK') {
         $country = 'GB';
     }
 
-    return ( $country && $country === $base_country ) ? true : false;
+    return ($country && $country === $base_country) ? true : false;
 }
 
-function wpinv_country_name( $country_code = '' ) { 
+function wpinv_country_name($country_code = '') { 
     $countries = wpinv_get_country_list();
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
-    $country = isset( $countries[$country_code] ) ? $countries[$country_code] : $country_code;
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
 
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
+    return apply_filters('wpinv_country_name', $country, $country_code);
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+	$state = wpinv_get_option('default_state', '');
 
-	return apply_filters( 'wpinv_default_state', $state );
+	return apply_filters('wpinv_default_state', $state);
 }
 
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
+function wpinv_state_name($state_code = '', $country_code = '') {
     $state = $state_code;
     
-    if ( !empty( $country_code ) ) {
-        $states = wpinv_get_country_states( $country_code );
+    if (!empty($country_code)) {
+        $states = wpinv_get_country_states($country_code);
         
-        $state = !empty( $states ) && isset( $states[$state_code] ) ? $states[$state_code] : $state;
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
     }
 
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
 }
 
 function wpinv_store_address() {
-    $address = wpinv_get_option( 'store_address', '' );
+    $address = wpinv_get_option('store_address', '');
 
-    return apply_filters( 'wpinv_store_address', $address );
+    return apply_filters('wpinv_store_address', $address);
 }
 
 /**
@@ -94,24 +94,24 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_maybe_add_default_address( &$invoice ) {
+function getpaid_maybe_add_default_address(&$invoice) {
 
     $user_id = $invoice->get_user_id();
 
     // Abort if the invoice belongs to no one.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
         return;
     }
 
     // Fill in defaults whenever necessary.
-    foreach ( wpinv_get_user_address( $user_id ) as $key => $value ) {
+    foreach (wpinv_get_user_address($user_id) as $key => $value) {
 
-        if ( is_callable( $invoice, "get_$key" ) ) {
-            $current = call_user_func( array( $invoice, "get_$key" ) );
+        if (is_callable($invoice, "get_$key")) {
+            $current = call_user_func(array($invoice, "get_$key"));
 
-            if ( empty( $current ) ) {
+            if (empty($current)) {
                 $method = "set_$key";
-                $invoice->$method( $value );
+                $invoice->$method($value);
             }
 
         }
@@ -130,22 +130,22 @@ 
     $address_fields = apply_filters(
         'getpaid_user_address_fields',
         array(
-            'first_name' => __( 'First Name', 'invoicing' ),
-            'last_name'  => __( 'Last Name', 'invoicing' ),
-            'address'    => __( 'Address', 'invoicing' ),
-            'city'       => __( 'City', 'invoicing' ),
-            'country'    => __( 'Country', 'invoicing' ),
-            'state'      => __( 'State', 'invoicing' ),
-            'zip'        => __( 'Zip/Postal Code', 'invoicing' ),
-            'phone'      => __( 'Phone Number', 'invoicing' ),
-            'company'    => __( 'Company', 'invoicing' ),
-            'company_id'    => __( 'Company ID', 'invoicing' ),
-            'vat_number' => __( 'VAT Number', 'invoicing' ),
+            'first_name' => __('First Name', 'invoicing'),
+            'last_name'  => __('Last Name', 'invoicing'),
+            'address'    => __('Address', 'invoicing'),
+            'city'       => __('City', 'invoicing'),
+            'country'    => __('Country', 'invoicing'),
+            'state'      => __('State', 'invoicing'),
+            'zip'        => __('Zip/Postal Code', 'invoicing'),
+            'phone'      => __('Phone Number', 'invoicing'),
+            'company'    => __('Company', 'invoicing'),
+            'company_id'    => __('Company ID', 'invoicing'),
+            'vat_number' => __('VAT Number', 'invoicing'),
         )
     );
 
-    if ( ! wpinv_use_taxes() && isset( $address_fields['vat_number'] ) ) {
-        unset( $address_fields['vat_number'] );
+    if (!wpinv_use_taxes() && isset($address_fields['vat_number'])) {
+        unset($address_fields['vat_number']);
     }
 
     return $address_fields;
@@ -156,8 +156,8 @@ 
  * 
  * @return bool
  */
-function getpaid_is_address_field_whitelisted( $key ) {
-    return array_key_exists( $key, getpaid_user_address_fields() );
+function getpaid_is_address_field_whitelisted($key) {
+    return array_key_exists($key, getpaid_user_address_fields());
 }
 
 /**
@@ -167,24 +167,24 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_save_invoice_user_address( $invoice ) {
+function getpaid_save_invoice_user_address($invoice) {
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
+    $invoice = wpinv_get_invoice($invoice);
 
     // Abort if it does not exist.
-    if ( empty( $invoice ) || $invoice->is_renewal() ) {
+    if (empty($invoice) || $invoice->is_renewal()) {
         return;
     }
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( is_callable( array( $invoice, "get_$field" ) ) ) {
-            $value = call_user_func( array( $invoice, "get_$field" ) );
+        if (is_callable(array($invoice, "get_$field"))) {
+            $value = call_user_func(array($invoice, "get_$field"));
 
             // Only save if it is not empty.
-            if ( ! empty( $value ) ) {
-                update_user_meta( $invoice->get_user_id(), '_wpinv_' . $field, $value );
+            if (!empty($value)) {
+                update_user_meta($invoice->get_user_id(), '_wpinv_' . $field, $value);
             }
 
         }
@@ -192,7 +192,7 @@ 
     }
 
 }
-add_action( 'getpaid_checkout_invoice_updated', 'getpaid_save_invoice_user_address' );
+add_action('getpaid_checkout_invoice_updated', 'getpaid_save_invoice_user_address');
 
 /**
  * Retrieves a saved user address.
@@ -201,14 +201,14 @@ 
  * @param bool $with_default Whether or not we should use the default country and state.
  * @return array
  */
-function wpinv_get_user_address( $user_id = 0, $with_default = true ) {
+function wpinv_get_user_address($user_id = 0, $with_default = true) {
 
     // Prepare the user id.
-    $user_id   = empty( $user_id ) ? get_current_user_id() : $user_id;
-    $user_info = get_userdata( $user_id );
+    $user_id   = empty($user_id) ? get_current_user_id() : $user_id;
+    $user_info = get_userdata($user_id);
 
     // Abort if non exists.
-    if ( empty( $user_info ) ) {
+    if (empty($user_info)) {
         return array();
     }
 
@@ -218,13 +218,13 @@ 
         'email'   => $user_info->user_email,
     );
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
-        $address[$field] = getpaid_get_user_address_field( $user_id, $field );
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
+        $address[$field] = getpaid_get_user_address_field($user_id, $field);
     }
 
-    $address = array_filter( $address );
+    $address = array_filter($address);
 
-    if ( ! $with_default ) {
+    if (!$with_default) {
         return $address;
     }
 
@@ -235,7 +235,7 @@ 
         'country'    => wpinv_get_default_country(),
     );
 
-    return getpaid_array_merge_if_empty( $address, $defaults );
+    return getpaid_array_merge_if_empty($address, $defaults);
 
 }
 
@@ -246,7 +246,7 @@ 
  * @param string $field The field to use.
  * @return string|null
  */
-function getpaid_get_user_address_field( $user_id, $field ) {
+function getpaid_get_user_address_field($user_id, $field) {
 
     $prefixes = array(
         '_wpinv_',
@@ -254,15 +254,15 @@ 
         ''
     );
 
-    foreach ( $prefixes as $prefix ) {
+    foreach ($prefixes as $prefix) {
 
         // Meta table.
-        $value = get_user_meta( $user_id, $prefix . $field, true );
+        $value = get_user_meta($user_id, $prefix . $field, true);
         
         // UWP table.
-        $value = ( empty( $value ) && function_exists( 'uwp_get_usermeta' ) ) ? uwp_get_usermeta( $user_id, $prefix . $field ) : $value;
+        $value = (empty($value) && function_exists('uwp_get_usermeta')) ? uwp_get_usermeta($user_id, $prefix . $field) : $value;
 
-        if ( ! empty( $value ) ) {
+        if (!empty($value)) {
             return $value;
         }
 
@@ -279,16 +279,16 @@ 
  * @param string $return What to return.
  * @return array
  */
-function wpinv_get_continents( $return = 'all' ) {
+function wpinv_get_continents($return = 'all') {
 
-    $continents = wpinv_get_data( 'continents' );
+    $continents = wpinv_get_data('continents');
 
-    switch( $return ) {
+    switch ($return) {
         case 'name' :
-            return wp_list_pluck( $continents, 'name' );
+            return wp_list_pluck($continents, 'name');
             break;
         case 'countries' :
-            return wp_list_pluck( $continents, 'countries' );
+            return wp_list_pluck($continents, 'countries');
             break;
         default :
             return $continents;
@@ -304,12 +304,12 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return string
  */
-function wpinv_get_continent_code_for_country( $country = false ) {
+function wpinv_get_continent_code_for_country($country = false) {
 
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
+	foreach (wpinv_get_continents('countries') as $continent_code => $countries) {
+		if (false !== array_search($country, $countries, true)) {
 			return $continent_code;
 		}
 	}
@@ -325,13 +325,13 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return array
  */
-function wpinv_get_country_calling_code( $country = null) {
+function wpinv_get_country_calling_code($country = null) {
 
-    $country = wpinv_sanitize_country( $country );
-    $codes   = wpinv_get_data( 'phone-codes' );
-    $code    = isset( $codes[ $country ] ) ? $codes[ $country ] : '';
+    $country = wpinv_sanitize_country($country);
+    $codes   = wpinv_get_data('phone-codes');
+    $code    = isset($codes[$country]) ? $codes[$country] : '';
 
-    if ( is_array( $code ) ) {
+    if (is_array($code)) {
         return $code[0];
     }
     return $code;
@@ -344,8 +344,8 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_list( $first_empty = false ) {
-    return wpinv_maybe_add_empty_option( apply_filters( 'wpinv_countries', wpinv_get_data( 'countries' ) ), $first_empty );
+function wpinv_get_country_list($first_empty = false) {
+    return wpinv_maybe_add_empty_option(apply_filters('wpinv_countries', wpinv_get_data('countries')), $first_empty);
 }
 
 /**
@@ -355,22 +355,22 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
+function wpinv_get_country_states($country = null, $first_empty = false) {
     
     // Prepare the country.
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
 
     // Fetch all states.
-    $all_states = wpinv_get_data( 'states' );
+    $all_states = wpinv_get_data('states');
 
     // Fetch the specified country's states.
-    $states     = isset( $all_states[ $country ] ) ? $all_states[ $country ] : array() ;
-    $states     = apply_filters( "wpinv_{$country}_states", $states );
-    $states     = apply_filters( 'wpinv_country_states', $states, $country );
+    $states     = isset($all_states[$country]) ? $all_states[$country] : array();
+    $states     = apply_filters("wpinv_{$country}_states", $states);
+    $states     = apply_filters('wpinv_country_states', $states, $country);
 
-    asort( $states );
+    asort($states);
      
-    return wpinv_maybe_add_empty_option( $states, $first_empty );
+    return wpinv_maybe_add_empty_option($states, $first_empty);
 }
 
 /**
@@ -380,7 +380,7 @@ 
  * @return array
  */
 function wpinv_get_us_states_list() {
-    return apply_filters( 'wpinv_usa_states', wpinv_get_country_states( 'US' ) );
+    return apply_filters('wpinv_usa_states', wpinv_get_country_states('US'));
 }
 
 /**
@@ -390,7 +390,7 @@ 
  * @return array
  */
 function wpinv_get_canada_states_list() {
-    return apply_filters( 'wpinv_canada_provinces', wpinv_get_country_states( 'CA' ) );
+    return apply_filters('wpinv_canada_provinces', wpinv_get_country_states('CA'));
 }
 
 /**
@@ -400,7 +400,7 @@ 
  * @return array
  */
 function wpinv_get_australia_states_list() {
-    return apply_filters( 'wpinv_australia_states', wpinv_get_country_states( 'AU' ) );
+    return apply_filters('wpinv_australia_states', wpinv_get_country_states('AU'));
 }
 
 /**
@@ -410,7 +410,7 @@ 
  * @return array
  */
 function wpinv_get_bangladesh_states_list() {
-    return apply_filters( 'wpinv_bangladesh_states', wpinv_get_country_states( 'BD' ) );
+    return apply_filters('wpinv_bangladesh_states', wpinv_get_country_states('BD'));
 }
 
 /**
@@ -420,7 +420,7 @@ 
  * @return array
  */
 function wpinv_get_brazil_states_list() {
-    return apply_filters( 'wpinv_brazil_states', wpinv_get_country_states( 'BR' ) );
+    return apply_filters('wpinv_brazil_states', wpinv_get_country_states('BR'));
 }
 
 /**
@@ -430,7 +430,7 @@ 
  * @return array
  */
 function wpinv_get_bulgaria_states_list() {
-    return apply_filters( 'wpinv_bulgaria_states', wpinv_get_country_states( 'BG' ) );
+    return apply_filters('wpinv_bulgaria_states', wpinv_get_country_states('BG'));
 }
 
 /**
@@ -440,7 +440,7 @@ 
  * @return array
  */
 function wpinv_get_hong_kong_states_list() {
-    return apply_filters( 'wpinv_hong_kong_states', wpinv_get_country_states( 'HK' ) );
+    return apply_filters('wpinv_hong_kong_states', wpinv_get_country_states('HK'));
 }
 
 /**
@@ -450,7 +450,7 @@ 
  * @return array
  */
 function wpinv_get_hungary_states_list() {
-    return apply_filters( 'wpinv_hungary_states', wpinv_get_country_states( 'HU' ) );
+    return apply_filters('wpinv_hungary_states', wpinv_get_country_states('HU'));
 }
 
 /**
@@ -460,7 +460,7 @@ 
  * @return array
  */
 function wpinv_get_japan_states_list() {
-    return apply_filters( 'wpinv_japan_states', wpinv_get_country_states( 'JP' ) );
+    return apply_filters('wpinv_japan_states', wpinv_get_country_states('JP'));
 }
 
 /**
@@ -470,7 +470,7 @@ 
  * @return array
  */
 function wpinv_get_china_states_list() {
-    return apply_filters( 'wpinv_china_states', wpinv_get_country_states( 'CN' ) );
+    return apply_filters('wpinv_china_states', wpinv_get_country_states('CN'));
 }
 
 /**
@@ -480,7 +480,7 @@ 
  * @return array
  */
 function wpinv_get_new_zealand_states_list() {
-    return apply_filters( 'wpinv_new_zealand_states', wpinv_get_country_states( 'NZ' ) );
+    return apply_filters('wpinv_new_zealand_states', wpinv_get_country_states('NZ'));
 }
 
 /**
@@ -490,7 +490,7 @@ 
  * @return array
  */
 function wpinv_get_peru_states_list() {
-    return apply_filters( 'wpinv_peru_states', wpinv_get_country_states( 'PE' ) );
+    return apply_filters('wpinv_peru_states', wpinv_get_country_states('PE'));
 }
 
 /**
@@ -500,7 +500,7 @@ 
  * @return array
  */
 function wpinv_get_indonesia_states_list() {
-    return apply_filters( 'wpinv_indonesia_states', wpinv_get_country_states( 'ID' ) );
+    return apply_filters('wpinv_indonesia_states', wpinv_get_country_states('ID'));
 }
 
 /**
@@ -510,7 +510,7 @@ 
  * @return array
  */
 function wpinv_get_india_states_list() {
-    return apply_filters( 'wpinv_india_states', wpinv_get_country_states( 'IN' ) );
+    return apply_filters('wpinv_india_states', wpinv_get_country_states('IN'));
 }
 
 /**
@@ -520,7 +520,7 @@ 
  * @return array
  */
 function wpinv_get_iran_states_list() {
-    return apply_filters( 'wpinv_iran_states', wpinv_get_country_states( 'IR' ) );
+    return apply_filters('wpinv_iran_states', wpinv_get_country_states('IR'));
 }
 
 /**
@@ -530,7 +530,7 @@ 
  * @return array
  */
 function wpinv_get_italy_states_list() {
-    return apply_filters( 'wpinv_italy_states', wpinv_get_country_states( 'IT' ) );
+    return apply_filters('wpinv_italy_states', wpinv_get_country_states('IT'));
 }
 
 /**
@@ -540,7 +540,7 @@ 
  * @return array
  */
 function wpinv_get_malaysia_states_list() {
-    return apply_filters( 'wpinv_malaysia_states', wpinv_get_country_states( 'MY' ) );
+    return apply_filters('wpinv_malaysia_states', wpinv_get_country_states('MY'));
 }
 
 /**
@@ -550,7 +550,7 @@ 
  * @return array
  */
 function wpinv_get_mexico_states_list() {
-    return apply_filters( 'wpinv_mexico_states', wpinv_get_country_states( 'MX' ) );
+    return apply_filters('wpinv_mexico_states', wpinv_get_country_states('MX'));
 }
 
 /**
@@ -560,7 +560,7 @@ 
  * @return array
  */
 function wpinv_get_nepal_states_list() {
-    return apply_filters( 'wpinv_nepal_states', wpinv_get_country_states( 'NP' ) );
+    return apply_filters('wpinv_nepal_states', wpinv_get_country_states('NP'));
 }
 
 /**
@@ -570,7 +570,7 @@ 
  * @return array
  */
 function wpinv_get_south_africa_states_list() {
-    return apply_filters( 'wpinv_south_africa_states', wpinv_get_country_states( 'ZA' ) );
+    return apply_filters('wpinv_south_africa_states', wpinv_get_country_states('ZA'));
 }
 
 /**
@@ -580,7 +580,7 @@ 
  * @return array
  */
 function wpinv_get_thailand_states_list() {
-    return apply_filters( 'wpinv_thailand_states', wpinv_get_country_states( 'TH' ) );
+    return apply_filters('wpinv_thailand_states', wpinv_get_country_states('TH'));
 }
 
 /**
@@ -590,7 +590,7 @@ 
  * @return array
  */
 function wpinv_get_turkey_states_list() {
-    return apply_filters( 'wpinv_turkey_states', wpinv_get_country_states( 'TR' ) );
+    return apply_filters('wpinv_turkey_states', wpinv_get_country_states('TR'));
 }
 
 /**
@@ -600,31 +600,31 @@ 
  * @return array
  */
 function wpinv_get_spain_states_list() {
-    return apply_filters( 'wpinv_spain_states', wpinv_get_country_states( 'ES' ) );
+    return apply_filters('wpinv_spain_states', wpinv_get_country_states('ES'));
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = wpinv_get_default_country();
 	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+	if (!empty($states)) {
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
 
-        $class  = isset( $_POST['class'] ) ? esc_attr( $_POST['class'] ) : '';
+        $class  = isset($_POST['class']) ? esc_attr($_POST['class']) : '';
         $class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
 
-        $args  = array(
+        $args = array(
 			'name'    => $sanitized_field_name,
 			'id'      => $sanitized_field_name,
-			'class'   => implode( ' ', array_unique( explode( ' ', $class ) ) ),
-			'options' => array_merge( array( '' => '' ), $states ),
+			'class'   => implode(' ', array_unique(explode(' ', $class))),
+			'options' => array_merge(array('' => ''), $states),
 			'show_option_all'  => false,
 			'show_option_none' => false
 		);
 
-		$response = wpinv_html_select( $args );
+		$response = wpinv_html_select($args);
 
 	} else {
 		$response = 'nostates';
@@ -633,10 +633,10 @@ 
 	return $response;
 }
 
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
-    $country = !empty( $country ) ? $country : wpinv_get_default_country();
+function wpinv_default_billing_country($country = '', $user_id = 0) {
+    $country = !empty($country) ? $country : wpinv_get_default_country();
     
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
 }
 
 /**
@@ -648,7 +648,7 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
+		return apply_filters('wpinv_localisation_address_formats',
 			array(
 				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
 				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
@@ -697,9 +697,9 @@ 
  * @see `wpinv_get_invoice_address_replacements`
  * @return string
  */
-function wpinv_get_full_address_format( $country = false) {
+function wpinv_get_full_address_format($country = false) {
 
-    if( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
 
@@ -707,7 +707,7 @@ 
 	$formats = wpinv_get_address_formats();
 
 	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+	$format = ($country && isset($formats[$country])) ? $formats[$country] : $formats['default'];
     
     /**
 	 * Filters the address format to use on Invoices.
@@ -719,7 +719,7 @@ 
 	 * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
 	 */
-    return apply_filters( 'wpinv_get_full_address_format', $format, $country );
+    return apply_filters('wpinv_get_full_address_format', $format, $country);
 }
 
 /**
@@ -730,7 +730,7 @@ 
  * @param array $billing_details customer's billing details
  * @return array
  */
-function wpinv_get_invoice_address_replacements( $billing_details ) {
+function wpinv_get_invoice_address_replacements($billing_details) {
 
     $default_args = array(
         'address'           => '',
@@ -743,22 +743,22 @@ 
 		'company'           => '',
     );
 
-    $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
+    $args    = map_deep(wp_parse_args($billing_details, $default_args), 'trim');
     $state   = $args['state'];
     $country = $args['country'];
 
     // Handle full country name.
-    $full_country = empty( $country ) ? $country : wpinv_country_name( $country );
+    $full_country = empty($country) ? $country : wpinv_country_name($country);
 
     // Handle full state name.
-    $full_state   = ( $country && $state ) ?  wpinv_state_name( $state, $country ) : $state;
+    $full_state   = ($country && $state) ?  wpinv_state_name($state, $country) : $state;
 
     $args['postcode']    = $args['zip'];
     $args['name']        = $args['first_name'] . ' ' . $args['last_name'];
     $args['state']       = $full_state;
     $args['state_code']  = $state;
     $args['country']     = $full_country;
-    $args['country_code']= $country;
+    $args['country_code'] = $country;
 
     /**
 	 * Filters the address format replacements to use on Invoices.
@@ -769,14 +769,14 @@ 
 	 * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
 	 */
-    $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
+    $replacements = apply_filters('wpinv_get_invoice_address_replacements', $args, $billing_details);
 
     $return = array();
 
-    foreach( $replacements as $key => $value ) {
-        $value  = is_scalar( $value ) ? trim( sanitize_text_field( $value ) ) : '';
+    foreach ($replacements as $key => $value) {
+        $value = is_scalar($value) ? trim(sanitize_text_field($value)) : '';
         $return['{{' . $key . '}}'] = $value;
-        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper( $value );
+        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper($value);
     }
 
     return $return;
@@ -790,6 +790,6 @@ 
  * @since 1.0.14
  * @return string
  */
-function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+function wpinv_trim_formatted_address_line($line) {
+	return trim($line, ', ');
 }
\ No newline at end of file

includes/gateways/class-getpaid-paypal-gateway-ipn-handler.php

Spacing +151 added lines, -151 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Paypal Payment Gateway IPN handler class.
@@ -31,7 +31,7 @@ 
 	 *
 	 * @param GetPaid_Paypal_Gateway $gateway
 	 */
-	public function __construct( $gateway ) {
+	public function __construct($gateway) {
 		$this->gateway = $gateway;
 		$this->verify_ipn();
 	}
@@ -43,37 +43,37 @@ 
 	 */
 	public function verify_ipn() {
 
-		wpinv_error_log( 'GetPaid PayPal IPN Handler', false );
+		wpinv_error_log('GetPaid PayPal IPN Handler', false);
 
 		// Validate the IPN.
-		if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-			wp_die( 'PayPal IPN Request Failure', 500 );
+		if (empty($_POST) || !$this->validate_ipn()) {
+			wp_die('PayPal IPN Request Failure', 500);
 		}
 
 		// Process the IPN.
-		$posted  = wp_kses_post_deep( wp_unslash( $_POST ) );
-		$invoice = $this->get_ipn_invoice( $posted );
+		$posted  = wp_kses_post_deep(wp_unslash($_POST));
+		$invoice = $this->get_ipn_invoice($posted);
 
 		// Abort if it was not paid by our gateway.
-		if ( $this->id != $invoice->get_gateway() ) {
-			wpinv_error_log( 'Aborting, Invoice was not paid via PayPal', false );
-			wp_die( 'Invoice not paid via PayPal', 200 );
+		if ($this->id != $invoice->get_gateway()) {
+			wpinv_error_log('Aborting, Invoice was not paid via PayPal', false);
+			wp_die('Invoice not paid via PayPal', 200);
 		}
 
-		$posted['payment_status'] = isset( $posted['payment_status'] ) ? sanitize_key( strtolower( $posted['payment_status'] ) ) : '';
-		$posted['txn_type']       = sanitize_key( strtolower( $posted['txn_type'] ) );
+		$posted['payment_status'] = isset($posted['payment_status']) ? sanitize_key(strtolower($posted['payment_status'])) : '';
+		$posted['txn_type']       = sanitize_key(strtolower($posted['txn_type']));
 
-		wpinv_error_log( 'Payment status:' . $posted['payment_status'], false );
-		wpinv_error_log( 'IPN Type:' . $posted['txn_type'], false );
+		wpinv_error_log('Payment status:' . $posted['payment_status'], false);
+		wpinv_error_log('IPN Type:' . $posted['txn_type'], false);
 
-		if ( method_exists( $this, 'ipn_txn_' . $posted['txn_type'] ) ) {
-			call_user_func( array( $this, 'ipn_txn_' . $posted['txn_type'] ), $invoice, $posted );
-			wpinv_error_log( 'Done processing IPN', false );
-			wp_die( 'Processed', 200 );
+		if (method_exists($this, 'ipn_txn_' . $posted['txn_type'])) {
+			call_user_func(array($this, 'ipn_txn_' . $posted['txn_type']), $invoice, $posted);
+			wpinv_error_log('Done processing IPN', false);
+			wp_die('Processed', 200);
 		}
 
-		wpinv_error_log( 'Aborting, Unsupported IPN type:' . $posted['txn_type'], false );
-		wp_die( 'Unsupported IPN type', 200 );
+		wpinv_error_log('Aborting, Unsupported IPN type:' . $posted['txn_type'], false);
+		wp_die('Unsupported IPN type', 200);
 
 	}
 
@@ -83,22 +83,22 @@ 
 	 * @param array $posted
 	 * @return WPInv_Invoice
 	 */
-	protected function get_ipn_invoice( $posted ) {
+	protected function get_ipn_invoice($posted) {
 
-		wpinv_error_log( 'Retrieving PayPal IPN Response Invoice', false );
+		wpinv_error_log('Retrieving PayPal IPN Response Invoice', false);
 
-		if ( ! empty( $posted['custom'] ) ) {
-			$invoice = new WPInv_Invoice( $posted['custom'] );
+		if (!empty($posted['custom'])) {
+			$invoice = new WPInv_Invoice($posted['custom']);
 
-			if ( $invoice->exists() ) {
-				wpinv_error_log( 'Found invoice #' . $invoice->get_number(), false );
+			if ($invoice->exists()) {
+				wpinv_error_log('Found invoice #' . $invoice->get_number(), false);
 				return $invoice;
 			}
 
 		}
 
-		wpinv_error_log( 'Could not retrieve the associated invoice.', false );
-		wp_die( 'Could not retrieve the associated invoice.', 200 );
+		wpinv_error_log('Could not retrieve the associated invoice.', false);
+		wp_die('Could not retrieve the associated invoice.', 200);
 	}
 
 	/**
@@ -106,14 +106,14 @@ 
 	 */
 	protected function validate_ipn() {
 
-		wpinv_error_log( 'Validating PayPal IPN response', false );
+		wpinv_error_log('Validating PayPal IPN response', false);
 
 		// Retrieve the associated invoice.
-		$posted  = wp_kses_post_deep( wp_unslash( $_POST ) );
-		$invoice = $this->get_ipn_invoice( $posted );
+		$posted  = wp_kses_post_deep(wp_unslash($_POST));
+		$invoice = $this->get_ipn_invoice($posted);
 
-		if ( $this->gateway->is_sandbox( $invoice ) ) {
-			wpinv_error_log( $posted, 'Invoice was processed in sandbox hence logging the posted data', false );
+		if ($this->gateway->is_sandbox($invoice)) {
+			wpinv_error_log($posted, 'Invoice was processed in sandbox hence logging the posted data', false);
 		}
 
 		// Validate the IPN.
@@ -130,20 +130,20 @@ 
 		);
 
 		// Post back to get a response.
-		$response = wp_safe_remote_post( $this->gateway->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr' : 'https://www.paypal.com/cgi-bin/webscr', $params );
+		$response = wp_safe_remote_post($this->gateway->is_sandbox($invoice) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr' : 'https://www.paypal.com/cgi-bin/webscr', $params);
 
 		// Check to see if the request was valid.
-		if ( ! is_wp_error( $response ) && $response['response']['code'] < 300 && strstr( $response['body'], 'VERIFIED' ) ) {
-			wpinv_error_log( 'Received valid response from PayPal IPN: ' . $response['body'], false );
+		if (!is_wp_error($response) && $response['response']['code'] < 300 && strstr($response['body'], 'VERIFIED')) {
+			wpinv_error_log('Received valid response from PayPal IPN: ' . $response['body'], false);
 			return true;
 		}
 
-		if ( is_wp_error( $response ) ) {
-			wpinv_error_log( $response->get_error_message(), 'Received invalid response from PayPal IPN' );
+		if (is_wp_error($response)) {
+			wpinv_error_log($response->get_error_message(), 'Received invalid response from PayPal IPN');
 			return false;
 		}
 
-		wpinv_error_log( $response['body'], 'Received invalid response from PayPal IPN' );
+		wpinv_error_log($response['body'], 'Received invalid response from PayPal IPN');
 		return false;
 
 	}
@@ -154,17 +154,17 @@ 
 	 * @param WPInv_Invoice $invoice          Invoice object.
 	 * @param string   $currency currency to validate.
 	 */
-	protected function validate_ipn_currency( $invoice, $currency ) {
+	protected function validate_ipn_currency($invoice, $currency) {
 
-		if ( strtolower( $invoice->get_currency() ) !== strtolower( $currency ) ) {
+		if (strtolower($invoice->get_currency()) !== strtolower($currency)) {
 
 			/* translators: %s: currency code. */
-			$invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal currencies do not match (code %s).', 'invoicing' ), $currency ) );
+			$invoice->update_status('wpi-processing', sprintf(__('Validation error: PayPal currencies do not match (code %s).', 'invoicing'), $currency));
 
-			wpinv_error_log( "Currencies do not match: {$currency} instead of {$invoice->get_currency()}", 'IPN Error', __FILE__, __LINE__, true );
+			wpinv_error_log("Currencies do not match: {$currency} instead of {$invoice->get_currency()}", 'IPN Error', __FILE__, __LINE__, true);
 		}
 
-		wpinv_error_log( $currency, 'Validated IPN Currency', false );
+		wpinv_error_log($currency, 'Validated IPN Currency', false);
 	}
 
 	/**
@@ -173,16 +173,16 @@ 
 	 * @param WPInv_Invoice $invoice          Invoice object.
 	 * @param float   $amount amount to validate.
 	 */
-	protected function validate_ipn_amount( $invoice, $amount ) {
-		if ( number_format( $invoice->get_total(), 2, '.', '' ) !== number_format( $amount, 2, '.', '' ) ) {
+	protected function validate_ipn_amount($invoice, $amount) {
+		if (number_format($invoice->get_total(), 2, '.', '') !== number_format($amount, 2, '.', '')) {
 
 			/* translators: %s: Amount. */
-			$invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal amounts do not match (gross %s).', 'invoicing' ), $amount ) );
+			$invoice->update_status('wpi-processing', sprintf(__('Validation error: PayPal amounts do not match (gross %s).', 'invoicing'), $amount));
 
-			wpinv_error_log( "Amounts do not match: {$amount} instead of {$invoice->get_total()}", 'IPN Error', __FILE__, __LINE__, true );
+			wpinv_error_log("Amounts do not match: {$amount} instead of {$invoice->get_total()}", 'IPN Error', __FILE__, __LINE__, true);
 		}
 
-		wpinv_error_log( $amount, 'Validated IPN Amount', false );
+		wpinv_error_log($amount, 'Validated IPN Amount', false);
 	}
 
 	/**
@@ -191,19 +191,19 @@ 
 	 * @param WPInv_Invoice $invoice          Invoice object.
 	 * @param string   $receiver_email Email to validate.
 	 */
-	protected function validate_ipn_receiver_email( $invoice, $receiver_email ) {
-		$paypal_email = wpinv_get_option( 'paypal_email' );
+	protected function validate_ipn_receiver_email($invoice, $receiver_email) {
+		$paypal_email = wpinv_get_option('paypal_email');
 
-		if ( strcasecmp( trim( $receiver_email ), trim( $paypal_email ) ) !== 0 ) {
-			wpinv_record_gateway_error( 'IPN Error', "IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}" );
+		if (strcasecmp(trim($receiver_email), trim($paypal_email)) !== 0) {
+			wpinv_record_gateway_error('IPN Error', "IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}");
 
 			/* translators: %s: email address . */
-			$invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal IPN response from a different email address (%s).', 'invoicing' ), $receiver_email ) );
+			$invoice->update_status('wpi-processing', sprintf(__('Validation error: PayPal IPN response from a different email address (%s).', 'invoicing'), $receiver_email));
 
-			return wpinv_error_log( "IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}", 'IPN Error', __FILE__, __LINE__, true );
+			return wpinv_error_log("IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}", 'IPN Error', __FILE__, __LINE__, true);
 		}
 
-		wpinv_error_log( 'Validated PayPal Email', false );
+		wpinv_error_log('Validated PayPal Email', false);
 	}
 
 	/**
@@ -212,70 +212,70 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_web_accept( $invoice, $posted ) {
+	protected function ipn_txn_web_accept($invoice, $posted) {
 
 		// Collect payment details
-		$payment_status = strtolower( $posted['payment_status'] );
-		$business_email = isset( $posted['business'] ) && is_email( $posted['business'] ) ? trim( $posted['business'] ) : trim( $posted['receiver_email'] );
+		$payment_status = strtolower($posted['payment_status']);
+		$business_email = isset($posted['business']) && is_email($posted['business']) ? trim($posted['business']) : trim($posted['receiver_email']);
 
-		$this->validate_ipn_receiver_email( $invoice, $business_email );
-		$this->validate_ipn_currency( $invoice, $posted['mc_currency'] );
+		$this->validate_ipn_receiver_email($invoice, $business_email);
+		$this->validate_ipn_currency($invoice, $posted['mc_currency']);
 
 		// Update the transaction id.
-		if ( ! empty( $posted['txn_id'] ) ) {
-			$invoice->set_transaction_id( wpinv_clean( $posted['txn_id'] ) );
+		if (!empty($posted['txn_id'])) {
+			$invoice->set_transaction_id(wpinv_clean($posted['txn_id']));
 			$invoice->save();
 		}
 
-		$invoice->add_system_note( __( 'Processing invoice IPN', 'invoicing' ) );
+		$invoice->add_system_note(__('Processing invoice IPN', 'invoicing'));
 
 		// Process a refund.
-		if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+		if ($payment_status == 'refunded' || $payment_status == 'reversed') {
 
-			update_post_meta( $invoice->get_id(), 'refunded_remotely', 1 );
+			update_post_meta($invoice->get_id(), 'refunded_remotely', 1);
 
-			if ( ! $invoice->is_refunded() ) {
-				$invoice->update_status( 'wpi-refunded', $posted['reason_code'] );
+			if (!$invoice->is_refunded()) {
+				$invoice->update_status('wpi-refunded', $posted['reason_code']);
 			}
 
-			return wpinv_error_log( $posted['reason_code'], false );
+			return wpinv_error_log($posted['reason_code'], false);
 		}
 
 		// Process payments.
-		if ( $payment_status == 'completed' ) {
+		if ($payment_status == 'completed') {
 
-			if ( $invoice->is_paid() && 'wpi_processing' != $invoice->get_status() ) {
-				return wpinv_error_log( 'Aborting, Invoice #' . $invoice->get_number() . ' is already paid.', false );
+			if ($invoice->is_paid() && 'wpi_processing' != $invoice->get_status()) {
+				return wpinv_error_log('Aborting, Invoice #' . $invoice->get_number() . ' is already paid.', false);
 			}
 
-			$this->validate_ipn_amount( $invoice, $posted['mc_gross'] );
+			$this->validate_ipn_amount($invoice, $posted['mc_gross']);
 
 			$note = '';
 
-			if ( ! empty( $posted['mc_fee'] ) ) {
-				$note = sprintf( __( 'PayPal Transaction Fee %s.', 'invoicing' ), sanitize_text_field( $posted['mc_fee'] ) );
+			if (!empty($posted['mc_fee'])) {
+				$note = sprintf(__('PayPal Transaction Fee %s.', 'invoicing'), sanitize_text_field($posted['mc_fee']));
 			}
 
-			if ( ! empty( $posted['payer_status'] ) ) {
-				$note = ' ' . sprintf( __( 'Buyer status %s.', 'invoicing' ), sanitize_text_field( $posted['payer_status'] ) );
+			if (!empty($posted['payer_status'])) {
+				$note = ' ' . sprintf(__('Buyer status %s.', 'invoicing'), sanitize_text_field($posted['payer_status']));
 			}
 
-			$invoice->mark_paid( ( ! empty( $posted['txn_id'] ) ? sanitize_text_field( $posted['txn_id'] ) : '' ), trim( $note ) );
-			return wpinv_error_log( 'Invoice marked as paid.', false );
+			$invoice->mark_paid((!empty($posted['txn_id']) ? sanitize_text_field($posted['txn_id']) : ''), trim($note));
+			return wpinv_error_log('Invoice marked as paid.', false);
 
 		}
 
 		// Pending payments.
-		if ( $payment_status == 'pending' ) {
+		if ($payment_status == 'pending') {
 
 			/* translators: %s: pending reason. */
-			$invoice->update_status( 'wpi-onhold', sprintf( __( 'Payment pending (%s).', 'invoicing' ), $posted['pending_reason'] ) );
+			$invoice->update_status('wpi-onhold', sprintf(__('Payment pending (%s).', 'invoicing'), $posted['pending_reason']));
 
-			return wpinv_error_log( 'Invoice marked as "payment held".', false );
+			return wpinv_error_log('Invoice marked as "payment held".', false);
 		}
 
 		/* translators: %s: payment status. */
-		$invoice->update_status( 'wpi-failed', sprintf( __( 'Payment %s via IPN.', 'invoicing' ), sanitize_text_field( $posted['payment_status'] ) ) );
+		$invoice->update_status('wpi-failed', sprintf(__('Payment %s via IPN.', 'invoicing'), sanitize_text_field($posted['payment_status'])));
 
 	}
 
@@ -285,8 +285,8 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_cart( $invoice, $posted ) {
-		$this->ipn_txn_web_accept( $invoice, $posted );
+	protected function ipn_txn_cart($invoice, $posted) {
+		$this->ipn_txn_web_accept($invoice, $posted);
 	}
 
 	/**
@@ -295,43 +295,43 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_subscr_signup( $invoice, $posted ) {
+	protected function ipn_txn_subscr_signup($invoice, $posted) {
 
-		wpinv_error_log( 'Processing subscription signup', false );
+		wpinv_error_log('Processing subscription signup', false);
 
 		// Make sure the invoice has a subscription.
-		$subscription = getpaid_get_invoice_subscription( $invoice );
+		$subscription = getpaid_get_invoice_subscription($invoice);
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+		if (empty($subscription)) {
+			return wpinv_error_log('Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false);
 		}
 
-		wpinv_error_log( 'Found subscription #' . $subscription->get_id(), false );
+		wpinv_error_log('Found subscription #' . $subscription->get_id(), false);
 
 		// Validate the IPN.
-		$business_email = isset( $posted['business'] ) && is_email( $posted['business'] ) ? trim( $posted['business'] ) : trim( $posted['receiver_email'] );
-		$this->validate_ipn_receiver_email( $invoice, $business_email );
-		$this->validate_ipn_currency( $invoice, $posted['mc_currency'] );
+		$business_email = isset($posted['business']) && is_email($posted['business']) ? trim($posted['business']) : trim($posted['receiver_email']);
+		$this->validate_ipn_receiver_email($invoice, $business_email);
+		$this->validate_ipn_currency($invoice, $posted['mc_currency']);
 
 		// Activate the subscription.
-		$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-		$subscription->set_date_created( current_time( 'mysql' ) );
-		$subscription->set_expiration( date( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) ) );
-		$subscription->set_profile_id( sanitize_text_field( $posted['subscr_id'] ) );
+		$duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+		$subscription->set_date_created(current_time('mysql'));
+		$subscription->set_expiration(date('Y-m-d H:i:s', (current_time('timestamp') + $duration)));
+		$subscription->set_profile_id(sanitize_text_field($posted['subscr_id']));
 		$subscription->activate();
 
 		// Set the transaction id.
-		if ( ! empty( $posted['txn_id'] ) ) {
-			$invoice->add_note( sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $posted['txn_id'] ), false, false, true );
-			$invoice->set_transaction_id( $posted['txn_id'] );
+		if (!empty($posted['txn_id'])) {
+			$invoice->add_note(sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $posted['txn_id']), false, false, true);
+			$invoice->set_transaction_id($posted['txn_id']);
 		}
 
 		// Update the payment status.
 		$invoice->mark_paid();
 
-		$invoice->add_note( sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $posted['subscr_id'] ), false, false, true );
+		$invoice->add_note(sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $posted['subscr_id']), false, false, true);
 
-		wpinv_error_log( 'Subscription started.', false );
+		wpinv_error_log('Subscription started.', false);
 	}
 
 	/**
@@ -340,45 +340,45 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_subscr_payment( $invoice, $posted ) {
+	protected function ipn_txn_subscr_payment($invoice, $posted) {
 
 		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+		$subscription = getpaid_subscriptions()->get_invoice_subscription($invoice);
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+		if (empty($subscription)) {
+			return wpinv_error_log('Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false);
 		}
 
-		wpinv_error_log( 'Found subscription #' . $subscription->get_id(), false );
+		wpinv_error_log('Found subscription #' . $subscription->get_id(), false);
 
 		// PayPal sends a subscr_payment for the first payment too.
-		$date_completed = getpaid_format_date( $invoice->get_date_completed() );
-		$date_created   = getpaid_format_date( $invoice->get_date_created() );
-		$today_date     = getpaid_format_date( current_time( 'mysql' ) );
-		$payment_date   = getpaid_format_date( $posted['payment_date'] );
-		$subscribe_date = getpaid_format_date( $subscription->get_date_created() );
-		$dates          = array_filter( compact( 'date_completed', 'date_created', 'subscribe_date' ) );
+		$date_completed = getpaid_format_date($invoice->get_date_completed());
+		$date_created   = getpaid_format_date($invoice->get_date_created());
+		$today_date     = getpaid_format_date(current_time('mysql'));
+		$payment_date   = getpaid_format_date($posted['payment_date']);
+		$subscribe_date = getpaid_format_date($subscription->get_date_created());
+		$dates          = array_filter(compact('date_completed', 'date_created', 'subscribe_date'));
 
-		foreach( $dates as $date ) {
+		foreach ($dates as $date) {
 
-			if ( $date !== $today_date && $date !== $payment_date ) {
+			if ($date !== $today_date && $date !== $payment_date) {
 				continue;
 			}
 
-			if ( ! empty( $posted['txn_id'] ) ) {
-				$invoice->set_transaction_id( sanitize_text_field( $posted['txn_id'] ) );	
-				$invoice->add_note( wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , sanitize_text_field( $posted['txn_id'] ) ), false, false, true );
+			if (!empty($posted['txn_id'])) {
+				$invoice->set_transaction_id(sanitize_text_field($posted['txn_id']));	
+				$invoice->add_note(wp_sprintf(__('PayPal Transaction ID: %s', 'invoicing'), sanitize_text_field($posted['txn_id'])), false, false, true);
 			}
 
 			return $invoice->mark_paid();
 
 		}
 
-		wpinv_error_log( 'Processing subscription renewal payment for the invoice ' . $invoice->get_id(), false );
+		wpinv_error_log('Processing subscription renewal payment for the invoice ' . $invoice->get_id(), false);
 
 		// Abort if the payment is already recorded.
-		if ( wpinv_get_id_by_transaction_id( $posted['txn_id'] ) ) {
-			return wpinv_error_log( 'Aborting, Transaction ' . $posted['txn_id'] .' has already been processed', false );
+		if (wpinv_get_id_by_transaction_id($posted['txn_id'])) {
+			return wpinv_error_log('Aborting, Transaction ' . $posted['txn_id'] . ' has already been processed', false);
 		}
 
 		$args = array(
@@ -386,17 +386,17 @@ 
 			'gateway'        => $this->id,
 		);
 
-		$invoice = wpinv_get_invoice( $subscription->add_payment( $args ) );
+		$invoice = wpinv_get_invoice($subscription->add_payment($args));
 
-		if ( empty( $invoice ) ) {
+		if (empty($invoice)) {
 			return;
 		}
 
-		$invoice->add_note( wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $posted['txn_id'] ), false, false, true );
-		$invoice->add_note( wp_sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $posted['subscr_id'] ), false, false, true );
+		$invoice->add_note(wp_sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $posted['txn_id']), false, false, true);
+		$invoice->add_note(wp_sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $posted['subscr_id']), false, false, true);
 
 		$subscription->renew();
-		wpinv_error_log( 'Subscription renewed.', false );
+		wpinv_error_log('Subscription renewed.', false);
 
 	}
 
@@ -405,18 +405,18 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 */
-	protected function ipn_txn_subscr_cancel( $invoice ) {
+	protected function ipn_txn_subscr_cancel($invoice) {
 
 		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+		$subscription = getpaid_subscriptions()->get_invoice_subscription($invoice);
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false);
+		if (empty($subscription)) {
+			return wpinv_error_log('Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false);
 		}
 
-		wpinv_error_log( 'Processing subscription cancellation for the invoice ' . $invoice->get_id(), false );
+		wpinv_error_log('Processing subscription cancellation for the invoice ' . $invoice->get_id(), false);
 		$subscription->cancel();
-		wpinv_error_log( 'Subscription cancelled.', false );
+		wpinv_error_log('Subscription cancelled.', false);
 
 	}
 
@@ -426,18 +426,18 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_subscr_eot( $invoice ) {
+	protected function ipn_txn_subscr_eot($invoice) {
 
 		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+		$subscription = getpaid_subscriptions()->get_invoice_subscription($invoice);
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+		if (empty($subscription)) {
+			return wpinv_error_log('Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false);
 		}
 
-		wpinv_error_log( 'Processing subscription end of life for the invoice ' . $invoice->get_id(), false );
+		wpinv_error_log('Processing subscription end of life for the invoice ' . $invoice->get_id(), false);
 		$subscription->complete();
-		wpinv_error_log( 'Subscription completed.', false );
+		wpinv_error_log('Subscription completed.', false);
 
 	}
 
@@ -447,18 +447,18 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_subscr_failed( $invoice ) {
+	protected function ipn_txn_subscr_failed($invoice) {
 
 		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+		$subscription = getpaid_subscriptions()->get_invoice_subscription($invoice);
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+		if (empty($subscription)) {
+			return wpinv_error_log('Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false);
 		}
 
-		wpinv_error_log( 'Processing subscription payment failure for the invoice ' . $invoice->get_id(), false );
+		wpinv_error_log('Processing subscription payment failure for the invoice ' . $invoice->get_id(), false);
 		$subscription->failing();
-		wpinv_error_log( 'Subscription marked as failing.', false );
+		wpinv_error_log('Subscription marked as failing.', false);
 
 	}
 
@@ -468,18 +468,18 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_recurring_payment_suspended_due_to_max_failed_payment( $invoice ) {
+	protected function ipn_txn_recurring_payment_suspended_due_to_max_failed_payment($invoice) {
 
 		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+		$subscription = getpaid_subscriptions()->get_invoice_subscription($invoice);
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+		if (empty($subscription)) {
+			return wpinv_error_log('Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false);
 		}
 
-		wpinv_error_log( 'Processing subscription cancellation due to max failed payment for the invoice ' . $invoice->get_id(), false );
+		wpinv_error_log('Processing subscription cancellation due to max failed payment for the invoice ' . $invoice->get_id(), false);
 		$subscription->cancel();
-		wpinv_error_log( 'Subscription cancelled.', false );
+		wpinv_error_log('Subscription cancelled.', false);
 	}
 
 }

includes/admin/views/wizard-gateways.php

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -12,54 +12,54 @@ 
 
     <form method="post" class="text-center card-body">
         <div class="gp-wizard-payments">
-            <h2 class="gd-settings-title h3 "><?php _e( 'Gateway Setup', 'invoicing' ); ?></h2>
-            <p><?php _e( 'Below are a few gateways that can be setup in a few seconds.', 'invoicing' ); ?>
+            <h2 class="gd-settings-title h3 "><?php _e('Gateway Setup', 'invoicing'); ?></h2>
+            <p><?php _e('Below are a few gateways that can be setup in a few seconds.', 'invoicing'); ?>
                 <br>
-                <?php _e( 'We have 20+ Gateways that can be setup later.', 'invoicing' ); ?>
+                <?php _e('We have 20+ Gateways that can be setup later.', 'invoicing'); ?>
             </p>
 
             <ul class="list-group">
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg' );?>" class="ml-n2" alt="Stripe"></span>
-				    <?php if ( false === wpinv_get_option( 'stripe_live_connect_account_id' ) ) : ?>
+				    <span class="mr-auto"><img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg'); ?>" class="ml-n2" alt="Stripe"></span>
+				    <?php if (false === wpinv_get_option('stripe_live_connect_account_id')) : ?>
                         <a href="<?php echo wp_nonce_url(
                             add_query_arg(
                                 array(
                                     'getpaid-admin-action' => 'connect_gateway',
                                     'plugin'               => 'stripe',
-                                    'redirect'             => urlencode( add_query_arg( 'step', 'payments' ) ),
+                                    'redirect'             => urlencode(add_query_arg('step', 'payments')),
                                 ),
                                 admin_url()
                             ),
                             'getpaid-nonce',
                             'getpaid-nonce'
                         ); ?>"
-                        class="btn btn-sm btn-outline-primary"><?php _e( 'Connect', 'invoicing' ); ?></a>
+                        class="btn btn-sm btn-outline-primary"><?php _e('Connect', 'invoicing'); ?></a>
                     <?php else: ?>
-                        <span class="btn btn-sm btn-success"><?php _e( 'Connected', 'invoicing' ); ?></span>
+                        <span class="btn btn-sm btn-success"><?php _e('Connected', 'invoicing'); ?></span>
                     <?php endif; ?>
 				</li>
 
 				<li class="list-group-item">
                     <div class="d-flex justify-content-between align-items-center">
                         <span class="mr-auto">
-                            <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp' );?>" class="" alt="PayPal" height="25">
+                            <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp'); ?>" class="" alt="PayPal" height="25">
                         </span>
                         <a
                             href="#"
                             onclick="jQuery('.getpaid-setup-paypal-input').toggleClass('d-none'); return false;"
-                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php _e( 'Set-up', 'invoicing' ); ?></a>
+                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php _e('Set-up', 'invoicing'); ?></a>
                     </div>
                     <div class="mt-4 getpaid-setup-paypal-input d-none">
-                        <input type="text" placeholder="<?php esc_attr_e( 'PayPal Email', 'invoicing' ); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr( wpinv_get_option( 'paypal_email' ) ); ?>">
+                        <input type="text" placeholder="<?php esc_attr_e('PayPal Email', 'invoicing'); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr(wpinv_get_option('paypal_email')); ?>">
                     </div>
                 </li>
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><?php _e( 'Test Gateway', 'invoicing' ); ?></span>
+				    <span class="mr-auto"><?php _e('Test Gateway', 'invoicing'); ?></span>
 					<div class="custom-control custom-switch">
-						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked( wpinv_is_gateway_active( 'manual' ) ); ?>>
+						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked(wpinv_is_gateway_active('manual')); ?>>
 						<label class="custom-control-label" for="enable-manual-gateway"></label>
 					</div>
 				</li>
@@ -68,10 +68,10 @@ 
         </div>
 
         <p class="gp-setup-actions step text-center mt-4">
-			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e( 'Continue', 'invoicing' ); ?>" />
+			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e('Continue', 'invoicing'); ?>" />
 		</p>
         
-        <?php getpaid_hidden_field( 'save_step', 1 ); ?>
-        <?php wp_nonce_field( 'getpaid-setup-wizard', 'getpaid-setup-wizard' ); ?>
+        <?php getpaid_hidden_field('save_step', 1); ?>
+        <?php wp_nonce_field('getpaid-setup-wizard', 'getpaid-setup-wizard'); ?>
     </form>
 </div>

includes/reports/class-getpaid-reports-export.php

Spacing +41 added lines, -41 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Export Class.
@@ -19,8 +19,8 @@ 
 	public function display() {
 
 		echo "<div class='row mt-4' style='max-width: 920px;' >";
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$this->display_post_type_export( $post_type );
+		foreach (array_keys(getpaid_get_invoice_post_types()) as $post_type) {
+			$this->display_post_type_export($post_type);
 		}
 		$this->display_subscription_export();
 		echo "</div>";
@@ -31,13 +31,13 @@ 
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $post_type ) {
+	public function get_download_url($post_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'export_invoices',
-					'post_type'            => urlencode( $post_type ),
+					'post_type'            => urlencode($post_type),
 				)
 			),
 			'getpaid-nonce',
@@ -50,7 +50,7 @@ 
 	 * Displays a single post type export card.
 	 *
 	 */
-	public function display_post_type_export( $post_type ) {
+	public function display_post_type_export($post_type) {
 
 		?>
 
@@ -61,8 +61,8 @@ 
 					<strong>
 						<?php
 							printf(
-								__( 'Export %s', 'invoicing' ),
-								sanitize_text_field( getpaid_get_post_type_label( $post_type ) )
+								__('Export %s', 'invoicing'),
+								sanitize_text_field(getpaid_get_post_type_label($post_type))
 							);
 						?>
 					</strong>
@@ -70,14 +70,14 @@ 
 
 				<div class="card-body">
 
-					<form method="post" action="<?php echo esc_url( $this->get_download_url( $post_type ) ); ?>">
+					<form method="post" action="<?php echo esc_url($this->get_download_url($post_type)); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( $post_type ) );
-							$this->display_markup( $this->generate_to_date( $post_type ) );
-							$this->display_markup( $this->generate_post_status_select( $post_type ) );
-							$this->display_markup( $this->generate_file_type_select( $post_type ) );
-							submit_button( __( 'Download', 'invoicing' ) );
+							$this->display_markup($this->generate_from_date($post_type));
+							$this->display_markup($this->generate_to_date($post_type));
+							$this->display_markup($this->generate_post_status_select($post_type));
+							$this->display_markup($this->generate_file_type_select($post_type));
+							submit_button(__('Download', 'invoicing'));
 						?>
 
 					</form>
@@ -95,14 +95,14 @@ 
 	 * Generates the from date input field.
 	 *
 	 */
-	public function generate_from_date( $post_type ) {
+	public function generate_from_date($post_type) {
 
 		return aui()->input(
 			array(
 				'name'       => 'from_date',
-				'id'         => esc_attr( "$post_type-from_date" ),
+				'id'         => esc_attr("$post_type-from_date"),
 				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'From Date', 'invoicing' ),
+				'label'      => __('From Date', 'invoicing'),
 				'label_type' => 'vertical',
 				'label_class' => 'd-block',
 				'type'       => 'datepicker',
@@ -115,14 +115,14 @@ 
 	 * Generates the to date input field.
 	 *
 	 */
-	public function generate_to_date( $post_type ) {
+	public function generate_to_date($post_type) {
 
 		return aui()->input(
 			array(
 				'name'       => 'to_date',
-				'id'         => esc_attr( "$post_type-to_date" ),
+				'id'         => esc_attr("$post_type-to_date"),
 				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'To Date', 'invoicing' ),
+				'label'      => __('To Date', 'invoicing'),
 				'label_type' => 'vertical',
 				'label_class' => 'd-block',
 				'type'       => 'datepicker',
@@ -135,20 +135,20 @@ 
 	 * Generates the to post status select field.
 	 *
 	 */
-	public function generate_post_status_select( $post_type ) {
+	public function generate_post_status_select($post_type) {
 
-		if ( 'subscriptions' === $post_type ) {
+		if ('subscriptions' === $post_type) {
 			$options = getpaid_get_subscription_statuses();
 		} else {
-			$options = wpinv_get_invoice_statuses( true, false, $post_type );
+			$options = wpinv_get_invoice_statuses(true, false, $post_type);
 		}
 
 		return aui()->select(
 			array(
 				'name'        => 'status',
-				'id'          => esc_attr( "$post_type-status" ),
-				'placeholder' => __( 'All Statuses', 'invoicing' ),
-				'label'       => __( 'Status', 'invoicing' ),
+				'id'          => esc_attr("$post_type-status"),
+				'placeholder' => __('All Statuses', 'invoicing'),
+				'label'       => __('Status', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'options'     => $options,
@@ -161,20 +161,20 @@ 
 	 * Generates the to file type select field.
 	 *
 	 */
-	public function generate_file_type_select( $post_type ) {
+	public function generate_file_type_select($post_type) {
 
 		return aui()->select(
 			array(
 				'name'        => 'file_type',
-				'id'          => esc_attr( "$post_type-file_type" ),
-				'placeholder' => __( 'Select File Type', 'invoicing' ),
-				'label'       => __( 'Export File', 'invoicing' ),
+				'id'          => esc_attr("$post_type-file_type"),
+				'placeholder' => __('Select File Type', 'invoicing'),
+				'label'       => __('Export File', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'options'     => array(
-					'csv'  => __( 'CSV', 'invoicing' ),
-					'xml'  => __( 'XML', 'invoicing' ),
-					'json' => __( 'JSON', 'invoicing' ),
+					'csv'  => __('CSV', 'invoicing'),
+					'xml'  => __('XML', 'invoicing'),
+					'json' => __('JSON', 'invoicing'),
 				),
 			)
 		);
@@ -185,7 +185,7 @@ 
 	 * Displays a field's markup.
 	 *
 	 */
-	public function display_markup( $markup ) {
+	public function display_markup($markup) {
 
 		echo str_replace(
 			array(
@@ -211,20 +211,20 @@ 
 
 				<div class="card-header">
 					<strong>
-						<?php _e( 'Export Subscriptions', 'invoicing' ); ?>
+						<?php _e('Export Subscriptions', 'invoicing'); ?>
 					</strong>
 				</div>
 
 				<div class="card-body">
 
-					<form method="post" action="<?php echo esc_url( $this->get_download_url( 'subscriptions' ) ); ?>">
+					<form method="post" action="<?php echo esc_url($this->get_download_url('subscriptions')); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_to_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_post_status_select( 'subscriptions' ) );
-							$this->display_markup( $this->generate_file_type_select( 'subscriptions' ) );
-							submit_button( __( 'Download', 'invoicing' ) );
+							$this->display_markup($this->generate_from_date('subscriptions'));
+							$this->display_markup($this->generate_to_date('subscriptions'));
+							$this->display_markup($this->generate_post_status_select('subscriptions'));
+							$this->display_markup($this->generate_file_type_select('subscriptions'));
+							submit_button(__('Download', 'invoicing'));
 						?>
 
 					</form>

includes/reports/class-getpaid-subscription-exporter.php

Spacing +33 added lines, -33 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Subscription_Exporter Class.
@@ -18,7 +18,7 @@ 
 	 * @param array $args Args to search for.
 	 * @return array
 	 */
-	public function get_subscription_query_args( $args ) {
+	public function get_subscription_query_args($args) {
 
 		$query_args = array(
 			'status'      => 'all',
@@ -27,22 +27,22 @@ 
 			'fields'      => 'all',
 		);
 
-		if ( ! empty( $args['status'] ) && in_array( $args['status'], array_keys( getpaid_get_subscription_statuses() ), true ) ) {
-			$query_args['status'] = wpinv_clean( wpinv_parse_list( $args['status'] ) );
+		if (!empty($args['status']) && in_array($args['status'], array_keys(getpaid_get_subscription_statuses()), true)) {
+			$query_args['status'] = wpinv_clean(wpinv_parse_list($args['status']));
 		}
 
 		$date_query = array();
-		if ( ! empty( $args['to_date'] ) ) {
-			$date_query['before'] = wpinv_clean( $args['to_date'] );
+		if (!empty($args['to_date'])) {
+			$date_query['before'] = wpinv_clean($args['to_date']);
 		}
 
-		if ( ! empty( $args['from_date'] ) ) {
-			$date_query['after'] = wpinv_clean( $args['from_date'] );
+		if (!empty($args['from_date'])) {
+			$date_query['after'] = wpinv_clean($args['from_date']);
 		}
 
-		if ( ! empty( $date_query ) ) {
+		if (!empty($date_query)) {
 			$date_query['inclusive']          = true;
-			$query_args['date_created_query'] = array( $date_query );
+			$query_args['date_created_query'] = array($date_query);
 		}
 
 		return $query_args;
@@ -54,10 +54,10 @@ 
 	 * @param array $query_args GetPaid_Subscriptions_Query args.
 	 * @return WPInv_Subscription[]
 	 */
-	public function get_subscriptions( $query_args ) {
+	public function get_subscriptions($query_args) {
 
 		// Get subscriptions.
-		$subscriptions = new GetPaid_Subscriptions_Query( $query_args );
+		$subscriptions = new GetPaid_Subscriptions_Query($query_args);
 
 		// Prepare the results.
 		return $subscriptions->get_results();
@@ -68,22 +68,22 @@ 
 	 * Handles the actual download.
 	 *
 	 */
-	public function export( $post_type, $args ) {
+	public function export($post_type, $args) {
 
-		$subscriptions = $this->get_subscriptions( $this->get_subscription_query_args( $args ) );
+		$subscriptions = $this->get_subscriptions($this->get_subscription_query_args($args));
 		$stream        = $this->prepare_output();
 		$headers       = $this->get_export_fields();
-		$file_type     = $this->prepare_file_type( 'subscriptions' );
+		$file_type     = $this->prepare_file_type('subscriptions');
 
-		if ( 'csv' == $file_type ) {
-			$this->download_csv( $subscriptions, $stream, $headers );
-		} else if( 'xml' == $file_type ) {
-			$this->download_xml( $subscriptions, $stream, $headers );
+		if ('csv' == $file_type) {
+			$this->download_csv($subscriptions, $stream, $headers);
+		} else if ('xml' == $file_type) {
+			$this->download_xml($subscriptions, $stream, $headers);
 		} else {
-			$this->download_json( $subscriptions, $stream, $headers );
+			$this->download_json($subscriptions, $stream, $headers);
 		}
 
-		fclose( $stream );
+		fclose($stream);
 		exit;
 	}
 
@@ -95,32 +95,32 @@ 
 	 * @since       1.0.19
 	 * @return array
 	 */
-	public function prepare_row( $subscription, $fields ) {
+	public function prepare_row($subscription, $fields) {
 
 		$prepared      = array();
 		$amount_fields = $this->get_amount_fields();
 		$invoice       = $subscription->get_parent_payment();
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			$value  = '';
 			$method = "get_$field";
 
-			if ( 0 === stripos( $field, 'customer' ) || 'currency' === $field ) {
+			if (0 === stripos($field, 'customer') || 'currency' === $field) {
 
-				if ( method_exists( $invoice, $method ) ) {
-					$value  = $invoice->$method();
+				if (method_exists($invoice, $method)) {
+					$value = $invoice->$method();
 				}
 
-			} else if ( method_exists( $subscription, $method ) ) {
-				$value  = $subscription->$method();
+			} else if (method_exists($subscription, $method)) {
+				$value = $subscription->$method();
 			}
 
-			if ( in_array( $field, $amount_fields ) ) {
-				$value  = wpinv_round_amount( wpinv_sanitize_amount( $value ) );
+			if (in_array($field, $amount_fields)) {
+				$value = wpinv_round_amount(wpinv_sanitize_amount($value));
 			}
 
-			$prepared[ $field ] = wpinv_clean( $value );
+			$prepared[$field] = wpinv_clean($value);
 
 		}
 
@@ -166,7 +166,7 @@ 
 
     	);
 
-		return apply_filters( 'getpaid_subscription_exporter_get_fields', $fields );
+		return apply_filters('getpaid_subscription_exporter_get_fields', $fields);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 			'recurring_amount'
     	);
 
-		return apply_filters( 'getpaid_subscription_exporter_get_amount_fields', $fields );
+		return apply_filters('getpaid_subscription_exporter_get_amount_fields', $fields);
 	}
 
 }

includes/reports/class-getpaid-reports.php

Spacing +32 added lines, -32 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports Class.
@@ -17,11 +17,11 @@ 
 	 *
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'register_reports_page' ), 20 );
-		add_action( 'wpinv_reports_tab_reports', array( $this, 'display_reports_tab' ) );
-		add_action( 'wpinv_reports_tab_export', array( $this, 'display_exports_tab' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_graph', array( $this, 'download_graph' ) );
-		add_action( 'getpaid_authenticated_admin_action_export_invoices', array( $this, 'export_invoices' ) );
+		add_action('admin_menu', array($this, 'register_reports_page'), 20);
+		add_action('wpinv_reports_tab_reports', array($this, 'display_reports_tab'));
+		add_action('wpinv_reports_tab_export', array($this, 'display_exports_tab'));
+		add_action('getpaid_authenticated_admin_action_download_graph', array($this, 'download_graph'));
+		add_action('getpaid_authenticated_admin_action_export_invoices', array($this, 'export_invoices'));
 
 	}
 
@@ -33,11 +33,11 @@ 
 
 		add_submenu_page(
             'wpinv',
-            __( 'Reports', 'invoicing' ),
-            __( 'Reports', 'invoicing' ),
+            __('Reports', 'invoicing'),
+            __('Reports', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-reports',
-            array( $this, 'display_reports_page' )
+            array($this, 'display_reports_page')
 		);
 
 	}
@@ -50,26 +50,26 @@ 
 
 		// Prepare variables.
 		$tabs        = $this->get_tabs();
-		$current_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
-		$current_tab = array_key_exists( $current_tab, $tabs ) ? $current_tab : 'reports';
+		$current_tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'reports';
+		$current_tab = array_key_exists($current_tab, $tabs) ? $current_tab : 'reports';
 
 		// Display the current tab.
 		?>
 
         <div class="wrap">
 
-			<h1><?php echo sanitize_text_field( $tabs[ $current_tab ] ); ?></h1>
+			<h1><?php echo sanitize_text_field($tabs[$current_tab]); ?></h1>
 
 			<nav class="nav-tab-wrapper">
 
 				<?php
-					foreach( $tabs as $key => $label ) {
+					foreach ($tabs as $key => $label) {
 
-						$key   = sanitize_text_field( $key );
-						$label = sanitize_text_field( $label );
+						$key   = sanitize_text_field($key);
+						$label = sanitize_text_field($label);
 						$class = $key == $current_tab ? 'nav-tab nav-tab-active' : 'nav-tab';
 						$url   = esc_url(
-							add_query_arg( 'tab', $key, admin_url( 'admin.php?page=wpinv-reports' ) )
+							add_query_arg('tab', $key, admin_url('admin.php?page=wpinv-reports'))
 						);
 
 						echo "\n\t\t\t<a href='$url' class='$class'>$label</a>";
@@ -79,18 +79,18 @@ 
 
 			</nav>
 
-			<div class="bsui <?php echo esc_attr( $current_tab ); ?>">
-				<?php do_action( "wpinv_reports_tab_{$current_tab}" ); ?>
+			<div class="bsui <?php echo esc_attr($current_tab); ?>">
+				<?php do_action("wpinv_reports_tab_{$current_tab}"); ?>
 			</div>
 
         </div>
 		<?php
 
 			// Wordfence loads an unsupported version of chart js on our page.
-			wp_deregister_style( 'chart-js' );
-			wp_deregister_script( 'chart-js' );
-			wp_enqueue_script( 'chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array( 'jquery' ), '2.9.4', true );
-			wp_enqueue_style( 'chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4' );
+			wp_deregister_style('chart-js');
+			wp_deregister_script('chart-js');
+			wp_enqueue_script('chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array('jquery'), '2.9.4', true);
+			wp_enqueue_style('chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4');
 
 	}
 
@@ -102,11 +102,11 @@ 
 	public function get_tabs() {
 
 		$tabs = array(
-			'reports' => __( 'Reports', 'invoicing' ),
-			'export'  => __( 'Export', 'invoicing' ),
+			'reports' => __('Reports', 'invoicing'),
+			'export'  => __('Export', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_report_tabs', $tabs );
+		return apply_filters('getpaid_report_tabs', $tabs);
 	}
 
 	/**
@@ -136,11 +136,11 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function download_graph( $args ) {
+	public function download_graph($args) {
 
-		if ( ! empty( $args['graph'] ) ) {
+		if (!empty($args['graph'])) {
 			$downloader = new GetPaid_Graph_Downloader();
-			$downloader->download( $args['graph'] );
+			$downloader->download($args['graph']);
 		}
 
 	}
@@ -150,17 +150,17 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function export_invoices( $args ) {
+	public function export_invoices($args) {
 
-		if ( ! empty( $args['post_type'] ) ) {
+		if (!empty($args['post_type'])) {
 
-			if ( 'subscriptions' === $args['post_type'] ) {
+			if ('subscriptions' === $args['post_type']) {
 				$downloader = new GetPaid_Subscription_Exporter();
 			} else {
 				$downloader = new GetPaid_Invoice_Exporter();
 			}
 
-			$downloader->export( $args['post_type'], $args );
+			$downloader->export($args['post_type'], $args);
 		}
 
 	}