AyeCode / invoicing

templates/subscriptions/subscription-details.php

Spacing +40 added lines, -40 removed lines

@@ -9,17 +9,17 @@ 
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_single_subscription_before_notices', $subscription );
+do_action('getpaid_single_subscription_before_notices', $subscription);
 
 // Display errors and notices.
 wpinv_print_errors();
 
-$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
-$subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+$subscription_groups = getpaid_get_invoice_subscription_groups($subscription->get_parent_invoice_id());
+$subscription_group  = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
 
-do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
+do_action('getpaid_before_single_subscription', $subscription, $subscription_groups);
 
 ?>
 
@@ -31,44 +31,44 @@ 
 
 </style>
 
-<h2 class="mb-1 h4"><?php _e( 'Subscription Details', 'invoicing' ); ?></h2>
+<h2 class="mb-1 h4"><?php _e('Subscription Details', 'invoicing'); ?></h2>
 <table class="table table-bordered">
 	<tbody>
 
-		<?php foreach ( $widget->get_single_subscription_columns( $subscription ) as $key => $label ) : ?>
+		<?php foreach ($widget->get_single_subscription_columns($subscription) as $key => $label) : ?>
 
-			<tr class="getpaid-subscription-meta-<?php echo sanitize_html_class( $key ); ?>">
+			<tr class="getpaid-subscription-meta-<?php echo sanitize_html_class($key); ?>">
 
 				<th class="font-weight-bold" style="width: 35%">
-					<?php echo sanitize_text_field( $label ); ?>
+					<?php echo sanitize_text_field($label); ?>
 				</th>
 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+						switch ($key) {
 
 							case 'status':
-								echo sanitize_text_field( $subscription->get_status_label() );
+								echo sanitize_text_field($subscription->get_status_label());
 								break;
 
 							case 'start_date':
-								echo sanitize_text_field( getpaid_format_date_value( $subscription->get_date_created() ) );
+								echo sanitize_text_field(getpaid_format_date_value($subscription->get_date_created()));
 								break;
 
 							case 'expiry_date':
-								echo sanitize_text_field( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
+								echo sanitize_text_field(getpaid_format_date_value($subscription->get_next_renewal_date()));
 								break;
 
 							case 'initial_amount':
-								echo wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
+								echo wpinv_price($subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency());
 
-								if ( $subscription->has_trial_period() ) {
+								if ($subscription->has_trial_period()) {
 
 									echo "<small class='text-muted'>&nbsp;";
 									printf(
-										_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
-										sanitize_text_field( $subscription->get_trial_period() )
+										_x('( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing'),
+										sanitize_text_field($subscription->get_trial_period())
 									);
 									echo '</small>';
 
@@ -77,18 +77,18 @@ 
 								break;
 
 							case 'recurring_amount':
-								$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-								$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-								echo strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" );
+								$frequency = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
+								$amount    = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency());
+								echo strtolower("<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>");
 								break;
 
 							case 'item':
 
-								if ( empty( $subscription_group ) ) {
-									echo WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() );
+								if (empty($subscription_group)) {
+									echo WPInv_Subscriptions_List_Table::generate_item_markup($subscription->get_product_id());
 								} else {
-									$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-									echo implode( ' | ', $markup );
+									$markup = array_map(array('WPInv_Subscriptions_List_Table', 'generate_item_markup'), array_keys($subscription_group['items']));
+									echo implode(' | ', $markup);
 								}
 
 								break;
@@ -96,12 +96,12 @@ 
 							case 'payments':
 
 								$max_activations = (int) $subscription->get_bill_times();
-								echo (int) $subscription->get_times_billed() . ' / ' . ( empty( $max_activations ) ? "&infin;" : $max_activations );
+								echo (int) $subscription->get_times_billed() . ' / ' . (empty($max_activations) ? "&infin;" : $max_activations);
 
 								break;
 
 						}
-						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
+						do_action("getpaid_render_single_subscription_column_$key", $subscription);
 
 					?>
 				</td>
@@ -113,34 +113,34 @@ 
 	</tbody>
 </table>
 
-<?php if ( ! empty( $subscription_group ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php _e( 'Subscription Items', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_item_details_metabox( $subscription ); ?>
+<?php if (!empty($subscription_group)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php _e('Subscription Items', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_item_details_metabox($subscription); ?>
 <?php endif; ?>
 
-<h2 class='mt-5 mb-1 h4'><?php _e( 'Related Invoices', 'invoicing' ); ?></h2>
+<h2 class='mt-5 mb-1 h4'><?php _e('Related Invoices', 'invoicing'); ?></h2>
 
-<?php echo getpaid_admin_subscription_invoice_details_metabox( $subscription ); ?>
+<?php echo getpaid_admin_subscription_invoice_details_metabox($subscription); ?>
 
-<?php if ( 1 < count( $subscription_groups ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php _e( 'Related Subscriptions', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_related_subscriptions_metabox( $subscription ); ?>
+<?php if (1 < count($subscription_groups)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php _e('Related Subscriptions', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_related_subscriptions_metabox($subscription); ?>
 <?php endif; ?>
 
 <span class="form-text">
 
 	<?php
-		if ( $subscription->can_cancel() ) {
+		if ($subscription->can_cancel()) {
 			printf(
 				'<a href="%s" class="btn btn-danger btn-sm" onclick="return confirm(\'%s\')">%s</a>&nbsp;&nbsp;',
-				esc_url( $subscription->get_cancel_url() ),
-				esc_attr__( 'Are you sure you want to cancel this subscription?', 'invoicing' ),
-				__( 'Cancel Subscription', 'invoicing' )
+				esc_url($subscription->get_cancel_url()),
+				esc_attr__('Are you sure you want to cancel this subscription?', 'invoicing'),
+				__('Cancel Subscription', 'invoicing')
 			);
 		}
 
-		do_action( 'getpaid-single-subscription-page-actions', $subscription );
+		do_action('getpaid-single-subscription-page-actions', $subscription);
 	?>
 
-	<a href="<?php echo esc_url( getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) ); ?>" class="btn btn-secondary btn-sm"><?php _e( 'Go Back', 'invoicing' ); ?></a>
+	<a href="<?php echo esc_url(getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')))); ?>" class="btn btn-secondary btn-sm"><?php _e('Go Back', 'invoicing'); ?></a>
 </span>

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

Spacing +124 added lines, -124 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -149,8 +149,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);
 		}
 
 	}
@@ -160,19 +160,19 @@ 
 	 *
 	 * @param array $data
 	 */
-	public function load_data( $data ) {
+	public function load_data($data) {
 
 		// Remove slashes from the submitted data...
-		$data       = wp_unslash( $data );
+		$data       = 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 {
@@ -182,30 +182,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));
 
 	}
 
@@ -226,18 +226,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));
 	}
 
     /**
@@ -267,53 +267,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));
 	}
 
 	/**
@@ -333,7 +333,7 @@ 
 	 * @return bool
 	 */
 	public function has_invoice() {
-		return ! empty( $this->invoice );
+		return !empty($this->invoice);
 	}
 
 	/*
@@ -352,13 +352,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));
 	}
 
 	/**
@@ -367,24 +367,24 @@ 
 	 * @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();
 
-		$this->subscription_groups = getpaid_calculate_subscription_totals( $this );
+		$this->subscription_groups = getpaid_calculate_subscription_totals($this);
 	}
 
 	/**
@@ -395,17 +395,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]);
 		}
 
 	}
@@ -417,7 +417,7 @@ 
 	 */
 	public function get_subtotal() {
 
-		if ( wpinv_prices_include_tax() ) {
+		if (wpinv_prices_include_tax()) {
 			return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
 		}
 
@@ -431,7 +431,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'];
 		}
 
@@ -465,39 +465,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 ( 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 (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));
 	}
 
 	/**
@@ -506,16 +506,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']);
 
 	}
 
@@ -524,12 +524,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]);
 		}
 
 	}
@@ -543,11 +543,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);
 
 	}
 
@@ -596,13 +596,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));
 	}
 
 	/**
@@ -611,10 +611,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']);
 	}
 
 	/**
@@ -622,12 +622,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]);
 		}
 
 	}
@@ -639,7 +639,7 @@ 
 	 * @return bool
 	 */
 	public function has_discount_code() {
-		return ! empty( $this->discounts['discount_code'] );
+		return !empty($this->discounts['discount_code']);
 	}
 
 	/**
@@ -696,13 +696,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));
 	}
 
 	/**
@@ -711,11 +711,11 @@ 
 	 * @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) {
 
-		$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']);
 
 	}
 
@@ -724,12 +724,12 @@ 
 	 *
 	 * @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]);
 		}
 
 	}
@@ -768,7 +768,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function has_fees() {
-		return count( $this->fees ) !== 0;
+		return count($this->fees) !== 0;
 	}
 
 	/*
@@ -786,7 +786,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function is_initial_fetch() {
-		return empty( $this->data['initial_state'] );
+		return empty($this->data['initial_state']);
 	}
 
 	/**
@@ -796,7 +796,7 @@ 
 	 */
 	public function get_total() {
 		$total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() - $this->get_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -806,7 +806,7 @@ 
 	 */
 	public function get_recurring_total() {
 		$total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() - $this->get_recurring_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -818,12 +818,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);
 	}
 
 	/**
@@ -832,7 +832,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);
 	}
 
 	/**
@@ -842,7 +842,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);
 	}
 
 	/**
@@ -872,8 +872,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);
 	}
 
 	/**
@@ -881,8 +881,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']]);
 	}
 
 	/**
@@ -890,8 +890,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/payments/class-getpaid-payment-form-submission-refresh-prices.php

Spacing +71 added lines, -71 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission refresh prices class
@@ -23,22 +23,22 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		$this->response = array(
 			'submission_id' => $submission->id,
             'has_recurring' => $submission->has_recurring,
-            'is_free'       => ! $submission->should_collect_payment_details(),
+            'is_free'       => !$submission->should_collect_payment_details(),
 		);
 
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
-		$this->add_gateways( $submission );
-		$this->add_data( $submission );
+		$this->add_totals($submission);
+		$this->add_texts($submission);
+		$this->add_items($submission);
+		$this->add_fees($submission);
+		$this->add_discounts($submission);
+		$this->add_taxes($submission);
+		$this->add_gateways($submission);
+		$this->add_data($submission);
 
 	}
 
@@ -47,30 +47,30 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_totals( $submission ) {
+	public function add_totals($submission) {
 
 		$this->response = array_merge(
 			$this->response,
 			array(
 
 				'totals'        => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
-					'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
+					'subtotal'  => $submission->format_amount($submission->get_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_discount()),
+					'fees'      => $submission->format_amount($submission->get_fee()),
+					'tax'       => $submission->format_amount($submission->get_tax()),
+					'total'     => $submission->format_amount($submission->get_total()),
+					'raw_total' => html_entity_decode(sanitize_text_field($submission->format_amount($submission->get_total())), ENT_QUOTES),
 				),
 
 				'recurring'     => array(
-					'subtotal'  => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'     => $submission->format_amount( $submission->get_recurring_total() ),
+					'subtotal'  => $submission->format_amount($submission->get_recurring_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_recurring_discount()),
+					'fees'      => $submission->format_amount($submission->get_recurring_fee()),
+					'tax'       => $submission->format_amount($submission->get_recurring_tax()),
+					'total'     => $submission->format_amount($submission->get_recurring_total()),
 				),
 
-				'initial_amt'   => wpinv_round_amount( $submission->get_total(), null, true ),
+				'initial_amt'   => wpinv_round_amount($submission->get_total(), null, true),
 				'currency'      => $submission->get_currency(),
 
 			)
@@ -83,22 +83,22 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_texts( $submission ) {
+	public function add_texts($submission) {
 
-		$payable = $submission->format_amount( $submission->get_total() );
+		$payable = $submission->format_amount($submission->get_total());
 
-		if ( $submission->has_recurring != 0 && ! getpaid_should_group_subscriptions( $submission ) ) {
+		if ($submission->has_recurring != 0 && !getpaid_should_group_subscriptions($submission)) {
 
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
+			$recurring = new WPInv_Item($submission->has_recurring);
+			$period    = getpaid_get_subscription_period_label($recurring->get_recurring_period(true), $recurring->get_recurring_interval(), '');
 
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
+			if ($submission->get_total() == $submission->get_recurring_total()) {
 				$payable = "$payable / $period";
 			} else {
 				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
+					__('%1$s (renews at %2$s / %3$s)', 'invoicing'),
+					$submission->format_amount($submission->get_total()),
+					$submission->format_amount($submission->get_recurring_total()),
 					$period
 				);
 			}
@@ -109,14 +109,14 @@ 
 			'.getpaid-checkout-total-payable' => $payable,
 		);
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 			$item_id                                               = $item->get_id();
-			$initial_price                                         = $submission->format_amount( $this->standardize_price( $item->get_id(), $item->get_sub_total(), $submission->get_discount_code(), false ) );
-			$recurring_price                                       = $submission->format_amount( $this->standardize_price( $item->get_id(), $item->get_recurring_sub_total(), $submission->get_discount_code(), true ) );
-			$texts[".item-$item_id .getpaid-form-item-price-desc"] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
+			$initial_price                                         = $submission->format_amount($this->standardize_price($item->get_id(), $item->get_sub_total(), $submission->get_discount_code(), false));
+			$recurring_price                                       = $submission->format_amount($this->standardize_price($item->get_id(), $item->get_recurring_sub_total(), $submission->get_discount_code(), true));
+			$texts[".item-$item_id .getpaid-form-item-price-desc"] = getpaid_item_recurring_price_help_text($item, $submission->get_currency(), $initial_price, $recurring_price);
 		}
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+		$this->response = array_merge($this->response, array('texts' => $texts));
 
 	}
 
@@ -125,19 +125,19 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_items( $submission ) {
+	public function add_items($submission) {
 
 		// Add items.
 		$items = array();
 
-        foreach ( $submission->get_items() as $item ) {
+        foreach ($submission->get_items() as $item) {
 			$item_id           = $item->get_id();
-			$items["$item_id"] = $submission->format_amount( $item->get_sub_total() );
+			$items["$item_id"] = $submission->format_amount($item->get_sub_total());
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'items' => $items )
+			array('items' => $items)
 		);
 
 	}
@@ -147,17 +147,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_fees( $submission ) {
+	public function add_fees($submission) {
 
 		$fees = array();
 
-        foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[$name] = $submission->format_amount( $data['initial_fee'] );
+        foreach ($submission->get_fees() as $name => $data) {
+			$fees[$name] = $submission->format_amount($data['initial_fee']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'fees' => $fees )
+			array('fees' => $fees)
 		);
 
 	}
@@ -167,17 +167,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_discounts( $submission ) {
+	public function add_discounts($submission) {
 
 		$discounts = array();
 
-        foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[$name] = $submission->format_amount( $data['initial_discount'] );
+        foreach ($submission->get_discounts() as $name => $data) {
+			$discounts[$name] = $submission->format_amount($data['initial_discount']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'discounts' => $discounts )
+			array('discounts' => $discounts)
 		);
 
 	}
@@ -187,24 +187,24 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_taxes( $submission ) {
+	public function add_taxes($submission) {
 
 		$taxes  = array();
 		$markup = '';
-        foreach ( $submission->get_taxes() as $name => $data ) {
-			$name          = sanitize_text_field( $name );
-			$amount        = $submission->format_amount( $data['initial_tax'] );
+        foreach ($submission->get_taxes() as $name => $data) {
+			$name          = sanitize_text_field($name);
+			$amount        = $submission->format_amount($data['initial_tax']);
 			$taxes[$name]  = $amount;
 			$markup       .= "<small class='form-text'>$name : $amount</small>";
 		}
 
-		if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
+		if (wpinv_display_individual_tax_rates() && !empty($taxes)) {
 			$this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'taxes' => $taxes )
+			array('taxes' => $taxes)
 		);
 
 	}
@@ -214,16 +214,16 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_gateways( $submission ) {
+	public function add_gateways($submission) {
 
-		$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+		$gateways = array_keys(wpinv_get_enabled_payment_gateways());
 
-		if ( $this->response['has_recurring'] ) {
+		if ($this->response['has_recurring']) {
 
-			foreach ( $gateways as $i => $gateway ) {
+			foreach ($gateways as $i => $gateway) {
 
-				if ( ! wpinv_gateway_support_subscription( $gateway ) ) {
-					unset( $gateways[ $i ] );
+				if (!wpinv_gateway_support_subscription($gateway)) {
+					unset($gateways[$i]);
 				}
 
 			}
@@ -231,10 +231,10 @@ 
 		}
 
 
-		$gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
+		$gateways = apply_filters('getpaid_submission_gateways', $gateways, $submission);
 		$this->response = array_merge(
 			$this->response,
-			array( 'gateways' => $gateways )
+			array('gateways' => $gateways)
 		);
 
 	}
@@ -247,22 +247,22 @@ 
 	 * @param string $discount_code
 	 * @param bool $recurring
 	 */
-	public function standardize_price( $item_id, $item_total, $discount_code, $recurring = false ) {
+	public function standardize_price($item_id, $item_total, $discount_code, $recurring = false) {
 
 		$standardadized_price = $item_total;
 
 		// Do we have a $discount_code?
-		if ( ! empty( $discount_code ) ) {
+		if (!empty($discount_code)) {
 
-			$discount = new WPInv_Discount( $discount_code );
+			$discount = new WPInv_Discount($discount_code);
 
-			if ( $discount->exists() && $discount->is_valid_for_items( $item_id ) && ( ! $recurring || $discount->is_recurring() ) ) {
-				$standardadized_price = $item_total - $discount->get_discounted_amount( $item_total );
+			if ($discount->exists() && $discount->is_valid_for_items($item_id) && (!$recurring || $discount->is_recurring())) {
+				$standardadized_price = $item_total - $discount->get_discounted_amount($item_total);
 			}
 
 		}
 
-    	return max( 0, $standardadized_price );
+    	return max(0, $standardadized_price);
 
 	}
 
@@ -271,7 +271,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_data( $submission ) {
+	public function add_data($submission) {
 
 		$this->response = array_merge(
 			$this->response,