AyeCode / invoicing

includes/libraries/wp-all-import/class-getpaid-wp-all-import.php

Spacing +30 added lines, -30 removed lines

@@ -5,9 +5,9 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-include plugin_dir_path( __FILE__ ) . 'rapid-addon.php';
+include plugin_dir_path(__FILE__) . 'rapid-addon.php';
 
 /**
  * WP All Import class.
@@ -34,8 +34,8 @@ 
     public function __construct() {
 
 		// Init each store separately.
-		foreach ( array_keys( $this->datastores ) as $key ) {
-			$this->init_store( $key );
+		foreach (array_keys($this->datastores) as $key) {
+			$this->init_store($key);
 		}
 
 	}
@@ -43,51 +43,51 @@ 
 	/**
 	 * Inits a store.
 	 */
-    public function init_store( $key ) {
+    public function init_store($key) {
 
 		// Register the add-on.
-		$this->add_ons[ $key ] = new RapidAddon( 'GetPaid', 'getpaid_wp_al_import_' . $key );
+		$this->add_ons[$key] = new RapidAddon('GetPaid', 'getpaid_wp_al_import_' . $key);
 
 		// Create import function.
-		$import_function = function ( $post_id, $data, $import_options, $_post ) use ( $key ) {
-			$this->import_store( $key, $post_id, $data, $import_options, $_post );
+		$import_function = function($post_id, $data, $import_options, $_post) use ($key) {
+			$this->import_store($key, $post_id, $data, $import_options, $_post);
         };
 
-		$this->add_ons[ $key ]->set_import_function( $import_function );
+		$this->add_ons[$key]->set_import_function($import_function);
 
 		// Register store fields.
-		$this->add_store_fields( $key );
+		$this->add_store_fields($key);
 
 		// Only load on the correct post type.
-		$this->add_ons[ $key ]->run( array( 'post_types' => array( 'wpi_' . $key ) ) );
+		$this->add_ons[$key]->run(array('post_types' => array('wpi_' . $key)));
 
 		// Disable images.
-		$this->add_ons[ $key ]->disable_default_images();
+		$this->add_ons[$key]->disable_default_images();
 
 	}
 
 	/**
 	 * Retrieves store fields.
 	 */
-    public function get_store_fields( $key ) {
+    public function get_store_fields($key) {
 
 		// Fetch from data/invoice-schema.php, from data/discount-schema.php, from data/item-schema.php
-		$fields = wpinv_get_data( $key . '-schema' );
+		$fields = wpinv_get_data($key . '-schema');
 
-		if ( empty( $fields ) ) {
+		if (empty($fields)) {
 			return array();
 		}
 
 		// Clean the fields.
 		$prepared = array();
-		foreach ( $fields as $id => $field ) {
+		foreach ($fields as $id => $field) {
 
 			// Skip read only fields.
-			if ( ! empty( $field['readonly'] ) ) {
+			if (!empty($field['readonly'])) {
 				continue;
 			}
 
-			$prepared[ $id ] = $field;
+			$prepared[$id] = $field;
 
 		}
 
@@ -98,10 +98,10 @@ 
 	/**
 	 * Registers store fields.
 	 */
-    public function add_store_fields( $key ) {
+    public function add_store_fields($key) {
 
-		foreach ( $this->get_store_fields( $key ) as $field_id => $data ) {
-			$this->add_ons[ $key ]->add_field( $field_id, $data['description'], 'text' );
+		foreach ($this->get_store_fields($key) as $field_id => $data) {
+			$this->add_ons[$key]->add_field($field_id, $data['description'], 'text');
 		}
 
     }
@@ -109,36 +109,36 @@ 
 	/**
 	 * Handles store imports.
 	 */
-    public function import_store( $key, $post_id, $data, $import_options, $_post ) {
+    public function import_store($key, $post_id, $data, $import_options, $_post) {
 
 		// Is the store class set?
-		if ( ! isset( $this->datastores[ $key ] ) ) {
+		if (!isset($this->datastores[$key])) {
 			return;
 		}
 
 		/**@var GetPaid_Data */
-		$data_store = new $this->datastores[ $key ]( $post_id );
+		$data_store = new $this->datastores[$key]($post_id);
 
 		// Abort if the invoice/item/discount does not exist.
-		if ( ! $data_store->exists() ) {
+		if (!$data_store->exists()) {
 			return;
 		}
 
 		// Prepare data props.
 		$prepared = array();
 
-		foreach ( array_keys( $this->get_store_fields( $key ) ) as $field ) { 
+		foreach (array_keys($this->get_store_fields($key)) as $field) { 
 			// Make sure the user has allowed this field to be updated.
-			if ( empty( $_post['ID'] ) || $this->add_ons[ $key ]->can_update_meta( $field, $import_options ) ) { 
+			if (empty($_post['ID']) || $this->add_ons[$key]->can_update_meta($field, $import_options)) { 
 	
 				// Update the custom field with the imported data.
-				$prepared[ $field ] = $data[ $field ];
+				$prepared[$field] = $data[$field];
 			} 
 		}
 
 		// Only update if we have something to update.
-		if ( ! empty( $prepared ) ) {
-			$data_store->set_props( $prepared );
+		if (!empty($prepared)) {
+			$data_store->set_props($prepared);
 			$data_store->save();
 		}
 

templates/payment-forms/elements/address-fields.php

Spacing +51 added lines, -51 removed lines

@@ -12,75 +12,75 @@ 
  * @var GetPaid_Payment_Form $form
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$field_type = sanitize_key( $field_type );
+$field_type = sanitize_key($field_type);
 
 echo "<div class='row $field_type'>";
 
 // Prepare current user.
-if ( ! empty( $form->invoice ) ) {
+if (!empty($form->invoice)) {
     $user_id = $form->invoice->get_user_id();
 }
 
-if ( empty( $user_id ) && is_user_logged_in() ) {
+if (empty($user_id) && is_user_logged_in()) {
     $user_id = get_current_user_id();
 }
 
-if ( ! empty( $user_id ) ) {
-    $user  = wp_get_current_user();
+if (!empty($user_id)) {
+    $user = wp_get_current_user();
 }
 
-foreach ( $fields as $address_field ) {
+foreach ($fields as $address_field) {
 
     // Skip if it is hidden.
-    if ( empty( $address_field['visible'] ) ) {
+    if (empty($address_field['visible'])) {
         continue;
     }
 
-    do_action( 'getpaid_payment_form_address_field_before_' . $address_field['name'], $field_type, $address_field );
+    do_action('getpaid_payment_form_address_field_before_' . $address_field['name'], $field_type, $address_field);
 
     // Prepare variables.
     $field_name  = $address_field['name'];
     $field_name  = "{$field_type}[$field_name]";
-    $wrap_class  = getpaid_get_form_element_grid_class( $address_field );
-    $wrap_class  = esc_attr( "$wrap_class getpaid-address-field-wrapper" );
-    $placeholder = empty( $address_field['placeholder'] ) ? '' : esc_attr( $address_field['placeholder'] );
-    $description = empty( $address_field['description'] ) ? '' : wp_kses_post( $address_field['description'] );
-    $value       = ! empty( $user_id ) ? get_user_meta( $user_id, '_' . $address_field['name'], true ) : '';
-    $label       = empty( $address_field['label'] ) ? '' : wp_kses_post( $address_field['label'] );
-
-    $method_name = 'get_' . str_replace( 'wpinv_', '', $address_field['name'] );
-    if ( ! empty( $form->invoice ) && is_callable( array( $form->invoice, $method_name ) ) ) {
-        $value = call_user_func( array( $form->invoice, $method_name ) );
+    $wrap_class  = getpaid_get_form_element_grid_class($address_field);
+    $wrap_class  = esc_attr("$wrap_class getpaid-address-field-wrapper");
+    $placeholder = empty($address_field['placeholder']) ? '' : esc_attr($address_field['placeholder']);
+    $description = empty($address_field['description']) ? '' : wp_kses_post($address_field['description']);
+    $value       = !empty($user_id) ? get_user_meta($user_id, '_' . $address_field['name'], true) : '';
+    $label       = empty($address_field['label']) ? '' : wp_kses_post($address_field['label']);
+
+    $method_name = 'get_' . str_replace('wpinv_', '', $address_field['name']);
+    if (!empty($form->invoice) && is_callable(array($form->invoice, $method_name))) {
+        $value = call_user_func(array($form->invoice, $method_name));
     }
 
-    if ( empty( $value ) && 'wpinv_first_name' == $address_field['name'] && ! empty( $user ) ) {
+    if (empty($value) && 'wpinv_first_name' == $address_field['name'] && !empty($user)) {
         $value = $user->first_name;
     }
 
-    if ( empty( $value ) && 'wpinv_last_name' == $address_field['name'] && ! empty( $user ) ) {
+    if (empty($value) && 'wpinv_last_name' == $address_field['name'] && !empty($user)) {
         $value = $user->last_name;
     }
 
-    if ( ! empty( $address_field['required'] ) ) {
+    if (!empty($address_field['required'])) {
         $label .= "<span class='text-danger'> *</span>";
     }
 
     // Display the country.
-    if ( 'wpinv_country' == $address_field['name'] ) {
+    if ('wpinv_country' == $address_field['name']) {
 
         echo "<div class='form-group $wrap_class getpaid-address-field-wrapper__country'";
 
         echo aui()->select(
             array(
                 'options'     => wpinv_get_country_list(),
-                'name'        => esc_attr( $field_name ),
-                'id'          => sanitize_html_class( $field_name ) . $uniqid,
-                'value'       => esc_attr( $country ),
+                'name'        => esc_attr($field_name),
+                'id'          => sanitize_html_class($field_name) . $uniqid,
+                'value'       => esc_attr($country),
                 'placeholder' => $placeholder,
-                'required'    => ! empty( $address_field['required'] ),
-                'label'       => wp_kses_post( $label ),
+                'required'    => !empty($address_field['required']),
+                'label'       => wp_kses_post($label),
                 'label_type'  => 'vertical',
                 'help_text'   => $description,
                 'class'       => 'getpaid-address-field wpinv_country',
@@ -93,7 +93,7 @@ 
             )
         );
 
-        if ( wpinv_should_validate_vat_number() ) {
+        if (wpinv_should_validate_vat_number()) {
 
             echo aui()->input(
                 array(
@@ -102,7 +102,7 @@ 
                     'id'         => "shipping-toggle$uniqid",
                     'wrap_class' => "getpaid-address-field-wrapper__address-confirm mt-1 d-none",
                     'required'   => false,
-                    'label'      => __( 'I certify that I live in the country selected above', 'invoicing' ) . "<span class='text-danger'> *</span>",
+                    'label'      => __('I certify that I live in the country selected above', 'invoicing') . "<span class='text-danger'> *</span>",
                     'value'      => 1,
                     'checked'    => true,
                     'class'      => 'w-auto',
@@ -116,27 +116,27 @@ 
     }
 
     // Display the state.
-    else if ( 'wpinv_state' == $address_field['name'] ) {
+    else if ('wpinv_state' == $address_field['name']) {
 
-        if ( empty( $value ) ) {
+        if (empty($value)) {
             $value = wpinv_get_default_state();
         }
 
-        echo getpaid_get_states_select_markup (
+        echo getpaid_get_states_select_markup(
             $country,
             $value,
             $placeholder,
             $label,
             $description,
-            ! empty( $address_field['required'] ),
+            !empty($address_field['required']),
             $wrap_class,
             $field_name
         );
 
     } else {
 
-        $key      = str_replace( 'wpinv_', '', $address_field['name'] );
-        $key      = esc_attr( str_replace( '_', '-', $key ) );
+        $key      = str_replace('wpinv_', '', $address_field['name']);
+        $key      = esc_attr(str_replace('_', '-', $key));
         $autocomplete = '';
         $replacements = array(
             'zip'        => 'postal-code',
@@ -149,37 +149,37 @@ 
         );
 
 
-        if ( isset( $replacements[ $key ] ) ) {
+        if (isset($replacements[$key])) {
             $autocomplete = array(
-                'autocomplete' => "$field_type {$replacements[ $key ]}",
+                'autocomplete' => "$field_type {$replacements[$key]}",
             );
         }
 
         $append = '';
 
-        if ( 'billing' === $field_type && wpinv_should_validate_vat_number() && 'vat-number' === $key ) {
-            $valid    = esc_attr__( 'Valid', 'invoicing' );
-            $invalid  = esc_attr__( 'Invalid', 'invoicing' );
-            $validate = esc_attr__( 'Validate', 'invoicing' );
+        if ('billing' === $field_type && wpinv_should_validate_vat_number() && 'vat-number' === $key) {
+            $valid    = esc_attr__('Valid', 'invoicing');
+            $invalid  = esc_attr__('Invalid', 'invoicing');
+            $validate = esc_attr__('Validate', 'invoicing');
             $append   = "<span class='btn btn-primary getpaid-vat-number-validate' data-valid='$valid' data-invalid='$invalid' data-validate='$validate'>$validate</span>";
         }
 
-        if ( 'billing' === $field_type ) {
-            $description .= '<div class="getpaid-error-' . sanitize_html_class( $field_name ) . ' getpaid-custom-payment-form-errors alert alert-danger d-none"></div>';
+        if ('billing' === $field_type) {
+            $description .= '<div class="getpaid-error-' . sanitize_html_class($field_name) . ' getpaid-custom-payment-form-errors alert alert-danger d-none"></div>';
         }
 
         echo aui()->input(
             array(
-                'name'        => esc_attr( $field_name ),
-                'id'          => sanitize_html_class( $field_name ) . $uniqid,
-                'required'    => ! empty( $address_field['required'] ),
+                'name'        => esc_attr($field_name),
+                'id'          => sanitize_html_class($field_name) . $uniqid,
+                'required'    => !empty($address_field['required']),
                 'placeholder' => $placeholder,
-                'label'       => wp_kses_post( $label ),
+                'label'       => wp_kses_post($label),
                 'label_type'  => 'vertical',
                 'help_text'   => $description,
                 'type'        => 'text',
-                'value'       => esc_attr( $value ),
-                'class'       => 'getpaid-address-field ' . esc_attr( $address_field['name'] ),
+                'value'       => esc_attr($value),
+                'class'       => 'getpaid-address-field ' . esc_attr($address_field['name']),
                 'wrap_class'  => "$wrap_class getpaid-address-field-wrapper__$key",
                 'label_class' => 'getpaid-address-field-label getpaid-address-field-label__' . $key,
                 'extra_attributes'  => $autocomplete,
@@ -189,7 +189,7 @@ 
 
     }
 
-    do_action( 'getpaid_payment_form_address_field_after_' . $address_field['name'], $field_type, $address_field );
+    do_action('getpaid_payment_form_address_field_after_' . $address_field['name'], $field_type, $address_field);
 }
 
 echo "</div>";

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

Spacing +81 added lines, -81 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission refresh prices class
@@ -23,24 +23,24 @@ 
 	 *
 	 * @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,
 			'has_subscription_group'           => $submission->has_subscription_group(),
 			'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
-            '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);
 
 	}
 
@@ -49,30 +49,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(),
 
 			)
@@ -85,53 +85,53 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_texts( $submission ) {
+	public function add_texts($submission) {
 
-		$payable = $submission->format_amount( $submission->get_total() );
-		$groups  = getpaid_get_subscription_groups( $submission );
+		$payable = $submission->format_amount($submission->get_total());
+		$groups  = getpaid_get_subscription_groups($submission);
 
-		if ( $submission->has_recurring && 2 > count( $groups ) ) {
+		if ($submission->has_recurring && 2 > count($groups)) {
 
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
-			$main_item = reset( $groups );
+			$recurring = new WPInv_Item($submission->has_recurring);
+			$period    = getpaid_get_subscription_period_label($recurring->get_recurring_period(true), $recurring->get_recurring_interval(), '');
+			$main_item = reset($groups);
 
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
+			if ($submission->get_total() == $submission->get_recurring_total()) {
 				$payable = "$payable / $period";
-			} else if ( $main_item ) {
+			} else if ($main_item) {
 
-				$main_item = reset( $main_item );
+				$main_item = reset($main_item);
 
 				// Calculate the next renewal date.
-				$_period      = $main_item->get_recurring_period( true );
+				$_period      = $main_item->get_recurring_period(true);
 				$_interval    = $main_item->get_recurring_interval();
 
 				// If the subscription item has a trial period...
-				if ( $main_item->has_free_trial() ) {
-					$_period   = $main_item->get_trial_period( true );
+				if ($main_item->has_free_trial()) {
+					$_period   = $main_item->get_trial_period(true);
 					$_interval = $main_item->get_trial_interval();
 				}
 
 				$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
 				);
 
 				$payable .= sprintf(
 					'<small class="text-muted form-text">%s</small>',
 					sprintf(
-						__( 'First renewal on %s', 'invoicing' ),
-						getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
+						__('First renewal on %s', 'invoicing'),
+						getpaid_format_date(date('Y-m-d H:i:s', strtotime("+$_interval $_period", current_time('timestamp'))))
 					)
 				);
 
 			} 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
 				);
 			}
@@ -142,20 +142,20 @@ 
 			'.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( $item->get_sub_total() - $item->item_discount );
-			$recurring_price                                       = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
-			$texts[".item-$item_id .getpaid-form-item-price-desc"] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
-			$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
+			$initial_price                                         = $submission->format_amount($item->get_sub_total() - $item->item_discount);
+			$recurring_price                                       = $submission->format_amount($item->get_recurring_sub_total() - $item->recurring_item_discount);
+			$texts[".item-$item_id .getpaid-form-item-price-desc"] = getpaid_item_recurring_price_help_text($item, $submission->get_currency(), $initial_price, $recurring_price);
+			$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = sprintf(__('Subtotal: %s', 'invoicing'), $submission->format_amount($item->get_sub_total()));
 
-			if ( $item->get_quantity() == 1 ) {
+			if ($item->get_quantity() == 1) {
 				$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = '';
 			}
 
 		}
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+		$this->response = array_merge($this->response, array('texts' => $texts));
 
 	}
 
@@ -164,19 +164,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)
 		);
 
 	}
@@ -186,17 +186,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)
 		);
 
 	}
@@ -206,17 +206,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)
 		);
 
 	}
@@ -226,24 +226,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)
 		);
 
 	}
@@ -253,29 +253,29 @@ 
 	 *
 	 * @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 (
-					! getpaid_payment_gateway_supports( $gateway, 'subscription' )
-					|| ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
-					|| ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
-					unset( $gateways[ $i ] );
+					!getpaid_payment_gateway_supports($gateway, 'subscription')
+					|| ($this->response['has_subscription_group'] && !getpaid_payment_gateway_supports($gateway, 'single_subscription_group'))
+					|| ($this->response['has_multiple_subscription_groups'] && !getpaid_payment_gateway_supports($gateway, 'multiple_subscription_groups')) ) {
+					unset($gateways[$i]);
 				}
 
 			}
 
 		}
 
-		$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)
 		);
 
 	}
@@ -285,7 +285,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_data( $submission ) {
+	public function add_data($submission) {
 
 		$this->response = array_merge(
 			$this->response,

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

Spacing +145 added lines, -145 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Paypal Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'sandbox', 'single_subscription_group' );
+    protected $supports = array('subscription', 'sandbox', 'single_subscription_group');
 
     /**
 	 * Payment method order.
@@ -59,7 +59,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
+	public $currencies = array('AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR');
 
     /**
 	 * URL to view a transaction.
@@ -80,15 +80,15 @@ 
 	 */
 	public function __construct() {
 
-        $this->title                = __( 'PayPal Standard', 'invoicing' );
-        $this->method_title         = __( 'PayPal Standard', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to PayPal', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->title                = __('PayPal Standard', 'invoicing');
+        $this->method_title         = __('PayPal Standard', 'invoicing');
+        $this->checkout_button_text = __('Proceed to PayPal', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-		add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
-        add_filter( 'getpaid_paypal_sandbox_notice', array( $this, 'sandbox_notice' ) );
-		add_filter( 'getpaid_get_paypal_connect_url', array( $this, 'maybe_get_connect_url' ), 10, 2 );
-		add_action( 'getpaid_authenticated_admin_action_connect_paypal', array( $this, 'connect_paypal' ) );
+		add_filter('getpaid_paypal_args', array($this, 'process_subscription'), 10, 2);
+        add_filter('getpaid_paypal_sandbox_notice', array($this, 'sandbox_notice'));
+		add_filter('getpaid_get_paypal_connect_url', array($this, 'maybe_get_connect_url'), 10, 2);
+		add_action('getpaid_authenticated_admin_action_connect_paypal', array($this, 'connect_paypal'));
 
 		parent::__construct();
     }
@@ -102,16 +102,16 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Get redirect url.
-        $paypal_redirect = $this->get_request_url( $invoice );
+        $paypal_redirect = $this->get_request_url($invoice);
 
         // Add a note about the request url.
         $invoice->add_note(
             sprintf(
-                __( 'Redirecting to PayPal: %s', 'invoicing' ),
-                esc_url( $paypal_redirect )
+                __('Redirecting to PayPal: %s', 'invoicing'),
+                esc_url($paypal_redirect)
             ),
             false,
             false,
@@ -119,7 +119,7 @@ 
         );
 
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
 
     }
@@ -130,21 +130,21 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
 
         // Retrieve paypal args.
-        $paypal_args       = map_deep( $this->get_paypal_args( $invoice ), 'urlencode' );
+        $paypal_args = map_deep($this->get_paypal_args($invoice), 'urlencode');
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $paypal_args['bn'] = 'GetPaid_Subscribe_WPS_US';
         } else {
             $paypal_args['bn'] = 'GetPaid_ShoppingCart_WPS_US';
         }
 
-        return add_query_arg( $paypal_args, $this->endpoint );
+        return add_query_arg($paypal_args, $this->endpoint);
 
 	}
 
@@ -154,25 +154,25 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_paypal_args( $invoice ) {
+	protected function get_paypal_args($invoice) {
 
         // Whether or not to send the line items as one item.
-		$force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', true, $invoice );
+		$force_one_line_item = apply_filters('getpaid_paypal_force_one_line_item', true, $invoice);
 
-		if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
+		if ($invoice->is_recurring() || (wpinv_use_taxes() && wpinv_prices_include_tax())) {
 			$force_one_line_item = true;
 		}
 
 		$paypal_args = apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, $force_one_line_item )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, $force_one_line_item)
 			),
 			$invoice
 		);
 
-		return $this->fix_request_length( $invoice, $paypal_args );
+		return $this->fix_request_length($invoice, $paypal_args);
     }
 
     /**
@@ -181,9 +181,9 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_transaction_args( $invoice ) {
+	protected function get_transaction_args($invoice) {
 
-		$email = $this->is_sandbox( $invoice ) ? wpinv_get_option( 'paypal_sandbox_email', wpinv_get_option( 'paypal_email', '' ) ) : wpinv_get_option( 'paypal_email', '' );
+		$email = $this->is_sandbox($invoice) ? wpinv_get_option('paypal_sandbox_email', wpinv_get_option('paypal_email', '')) : wpinv_get_option('paypal_email', '');
 		return array(
             'cmd'           => '_cart',
             'business'      => $email,
@@ -194,16 +194,16 @@ 
             'rm'            => is_ssl() ? 2 : 1,
             'upload'        => 1,
             'currency_code' => $invoice->get_currency(), // https://developer.paypal.com/docs/nvp-soap-api/currency-codes/#paypal
-            'return'        => esc_url_raw( $this->get_return_url( $invoice ) ),
-            'cancel_return' => esc_url_raw( $invoice->get_checkout_payment_url() ),
-            'notify_url'    => getpaid_limit_length( $this->notify_url, 255 ),
-            'invoice'       => getpaid_limit_length( $invoice->get_number(), 127 ),
+            'return'        => esc_url_raw($this->get_return_url($invoice)),
+            'cancel_return' => esc_url_raw($invoice->get_checkout_payment_url()),
+            'notify_url'    => getpaid_limit_length($this->notify_url, 255),
+            'invoice'       => getpaid_limit_length($invoice->get_number(), 127),
             'custom'        => $invoice->get_id(),
-            'first_name'    => getpaid_limit_length( $invoice->get_first_name(), 32 ),
-            'last_name'     => getpaid_limit_length( $invoice->get_last_name(), 64 ),
-            'country'       => getpaid_limit_length( $invoice->get_country(), 2 ),
-            'email'         => getpaid_limit_length( $invoice->get_email(), 127 ),
-            'cbt'           => get_bloginfo( 'name' )
+            'first_name'    => getpaid_limit_length($invoice->get_first_name(), 32),
+            'last_name'     => getpaid_limit_length($invoice->get_last_name(), 64),
+            'country'       => getpaid_limit_length($invoice->get_country(), 2),
+            'email'         => getpaid_limit_length($invoice->get_email(), 127),
+            'cbt'           => get_bloginfo('name')
         );
 
     }
@@ -215,30 +215,30 @@ 
 	 * @param  bool     $force_one_line_item Create only one item for this invoice.
 	 * @return array
 	 */
-	protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
+	protected function get_line_item_args($invoice, $force_one_line_item = false) {
 
         // Maybe send invoice as a single item.
-		if ( $force_one_line_item ) {
-            return $this->get_line_item_args_single_item( $invoice );
+		if ($force_one_line_item) {
+            return $this->get_line_item_args_single_item($invoice);
         }
 
         // Send each line item individually.
         $line_item_args = array();
 
         // Prepare line items.
-        $this->prepare_line_items( $invoice );
+        $this->prepare_line_items($invoice);
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() && $invoice->is_taxable() ) {
-            $line_item_args['tax_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_tax(), 2 );
+        if (wpinv_use_taxes() && $invoice->is_taxable()) {
+            $line_item_args['tax_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_tax(), 2);
         }
 
         // Add discount.
-        if ( $invoice->get_total_discount() > 0 ) {
-            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_discount(), 2 );
+        if ($invoice->get_total_discount() > 0) {
+            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_discount(), 2);
         }
 
-		return array_merge( $line_item_args, $this->get_line_items() );
+		return array_merge($line_item_args, $this->get_line_items());
 
     }
 
@@ -248,11 +248,11 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_line_item_args_single_item( $invoice ) {
+	protected function get_line_item_args_single_item($invoice) {
 		$this->delete_line_items();
 
-        $item_name = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
-		$this->add_line_item( $item_name, 1, wpinv_round_amount( (float) $invoice->get_total(), 2, true ), $invoice->get_id() );
+        $item_name = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
+		$this->add_line_item($item_name, 1, wpinv_round_amount((float) $invoice->get_total(), 2, true), $invoice->get_id());
 
 		return $this->get_line_items();
     }
@@ -276,19 +276,19 @@ 
 	 *
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 */
-	protected function prepare_line_items( $invoice ) {
+	protected function prepare_line_items($invoice) {
 		$this->delete_line_items();
 
 		// Items.
-		foreach ( $invoice->get_items() as $item ) {
+		foreach ($invoice->get_items() as $item) {
 			$amount   = $item->get_price();
 			$quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
-			$this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
+			$this->add_line_item($item->get_raw_name(), $quantity, $amount, $item->get_id());
         }
 
         // Fees.
-		foreach ( $invoice->get_fees() as $fee => $data ) {
-            $this->add_line_item( $fee, 1, wpinv_sanitize_amount( $data['initial_fee'] ) );
+		foreach ($invoice->get_fees() as $fee => $data) {
+            $this->add_line_item($fee, 1, wpinv_sanitize_amount($data['initial_fee']));
         }
 
     }
@@ -301,15 +301,15 @@ 
 	 * @param  float  $amount Amount.
 	 * @param  string $item_number Item number.
 	 */
-	protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
-		$index = ( count( $this->line_items ) / 4 ) + 1;
+	protected function add_line_item($item_name, $quantity = 1, $amount = 0.0, $item_number = '') {
+		$index = (count($this->line_items) / 4) + 1;
 
 		$item = apply_filters(
 			'getpaid_paypal_line_item',
 			array(
-				'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
+				'item_name'   => html_entity_decode(getpaid_limit_length($item_name ? wp_strip_all_tags($item_name) : __('Item', 'invoicing'), 127), ENT_NOQUOTES, 'UTF-8'),
 				'quantity'    => (float) $quantity,
-				'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
+				'amount'      => wpinv_sanitize_amount((float) $amount, 2),
 				'item_number' => $item_number,
 			),
 			$item_name,
@@ -318,12 +318,12 @@ 
 			$item_number
 		);
 
-		$this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
-        $this->line_items[ 'quantity_' . $index ]    = $item['quantity'];
+		$this->line_items['item_name_' . $index] = getpaid_limit_length($item['item_name'], 127);
+        $this->line_items['quantity_' . $index] = $item['quantity'];
 
         // The price or amount of the product, service, or contribution, not including shipping, handling, or tax.
-		$this->line_items[ 'amount_' . $index ]      = $item['amount'] * $item['quantity'];
-		$this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
+		$this->line_items['amount_' . $index]      = $item['amount'] * $item['quantity'];
+		$this->line_items['item_number_' . $index] = getpaid_limit_length($item['item_number'], 127);
     }
 
     /**
@@ -335,19 +335,19 @@ 
 	 * @param array    $paypal_args Arguments sent to Paypal in the request.
 	 * @return array
 	 */
-	protected function fix_request_length( $invoice, $paypal_args ) {
+	protected function fix_request_length($invoice, $paypal_args) {
 		$max_paypal_length = 2083;
-		$query_candidate   = http_build_query( $paypal_args, '', '&' );
+		$query_candidate   = http_build_query($paypal_args, '', '&');
 
-		if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
+		if (strlen($this->endpoint . $query_candidate) <= $max_paypal_length) {
 			return $paypal_args;
 		}
 
 		return apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, true )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, true)
 			),
 			$invoice
 		);
@@ -360,10 +360,10 @@ 
 	 * @param  array $paypal_args PayPal args.
 	 * @param  WPInv_Invoice    $invoice Invoice object.
 	 */
-	public function process_subscription( $paypal_args, $invoice ) {
+	public function process_subscription($paypal_args, $invoice) {
 
         // Make sure this is a subscription.
-        if ( ! $invoice->is_recurring() || ! $subscription = getpaid_get_invoice_subscription( $invoice ) ) {
+        if (!$invoice->is_recurring() || !$subscription = getpaid_get_invoice_subscription($invoice)) {
             return $paypal_args;
         }
 
@@ -371,23 +371,23 @@ 
         $paypal_args['cmd'] = '_xclick-subscriptions';
 
         // Subscription name.
-        $paypal_args['item_name'] = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
+        $paypal_args['item_name'] = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
 
         // Get subscription args.
-        $period                 = strtoupper( substr( $subscription->get_period(), 0, 1) );
+        $period                 = strtoupper(substr($subscription->get_period(), 0, 1));
         $interval               = (int) $subscription->get_frequency();
         $bill_times             = (int) $subscription->get_bill_times();
-        $initial_amount         = (float) wpinv_sanitize_amount( $invoice->get_initial_total(), 2 );
-        $recurring_amount       = (float) wpinv_sanitize_amount( $invoice->get_recurring_total(), 2 );
-        $subscription_item      = $invoice->get_recurring( true );
+        $initial_amount         = (float) wpinv_sanitize_amount($invoice->get_initial_total(), 2);
+        $recurring_amount       = (float) wpinv_sanitize_amount($invoice->get_recurring_total(), 2);
+        $subscription_item      = $invoice->get_recurring(true);
 
 		// Convert 365 days to 1 year.
-		if ( 'D' == $period && 365 == $interval ) {
+		if ('D' == $period && 365 == $interval) {
 			$period = 'Y';
 			$interval = 1;
 		}
 
-        if ( $subscription_item->has_free_trial() ) {
+        if ($subscription_item->has_free_trial()) {
 
             $paypal_args['a1'] = 0 == $initial_amount ? 0 : $initial_amount;
 
@@ -397,28 +397,28 @@ 
 			// Trial period.
 			$paypal_args['t1'] = $subscription_item->get_trial_period();
 
-        } else if ( $initial_amount != $recurring_amount ) {
+        } else if ($initial_amount != $recurring_amount) {
 
             // No trial period, but initial amount includes a sign-up fee and/or other items, so charge it as a separate period.
 
-            if ( 1 == $bill_times ) {
+            if (1 == $bill_times) {
                 $param_number = 3;
             } else {
                 $param_number = 1;
             }
 
-            $paypal_args[ 'a' . $param_number ] = $initial_amount ? $initial_amount : 0;
+            $paypal_args['a' . $param_number] = $initial_amount ? $initial_amount : 0;
 
             // Sign Up interval
-            $paypal_args[ 'p' . $param_number ] = $interval;
+            $paypal_args['p' . $param_number] = $interval;
 
             // Sign Up unit of duration
-            $paypal_args[ 't' . $param_number ] = $period;
+            $paypal_args['t' . $param_number] = $period;
 
         }
 
         // We have a recurring payment
-		if ( ! isset( $param_number ) || 1 == $param_number ) {
+		if (!isset($param_number) || 1 == $param_number) {
 
 			// Subscription price
 			$paypal_args['a3'] = $recurring_amount;
@@ -432,7 +432,7 @@ 
         }
 
         // Recurring payments
-		if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
+		if (1 == $bill_times || ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial() && 2 == $bill_times)) {
 
 			// Non-recurring payments
 			$paypal_args['src'] = 0;
@@ -441,15 +441,15 @@ 
 
 			$paypal_args['src'] = 1;
 
-			if ( $bill_times > 0 ) {
+			if ($bill_times > 0) {
 
 				// An initial period is being used to charge a sign-up fee
-				if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
+				if ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial()) {
 					$bill_times--;
 				}
 
                 // Make sure it's not over the max of 52
-                $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+                $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
 
 			}
         }
@@ -458,10 +458,10 @@ 
         $paypal_args['rm'] = 2;
 
         // Get rid of redudant items.
-        foreach ( array( 'item_name_1', 'quantity_1', 'amount_1', 'item_number_1' ) as $arg ) {
+        foreach (array('item_name_1', 'quantity_1', 'amount_1', 'item_number_1') as $arg) {
 
-            if ( isset( $paypal_args[ $arg ] ) ) {
-                unset( $paypal_args[ $arg ] );
+            if (isset($paypal_args[$arg])) {
+                unset($paypal_args[$arg]);
             }
 
         }
@@ -480,7 +480,7 @@ 
 	 * @return void
 	 */
 	public function verify_ipn() {
-        new GetPaid_Paypal_Gateway_IPN_Handler( $this );
+        new GetPaid_Paypal_Gateway_IPN_Handler($this);
     }
 
     /**
@@ -489,7 +489,7 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-			__( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
+			__('SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing'),
 			'<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
 			'</a>'
 		);
@@ -501,30 +501,30 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['paypal_active']['desc'] .= " ($currencies)";
-        $admin_settings['paypal_desc']['std']     = __( 'Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing' );
+        $admin_settings['paypal_desc']['std']     = __('Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing');
 
 		// Access tokens.
-		$live_email      = wpinv_get_option( 'paypal_email' );
-		$sandbox_email   = wpinv_get_option( 'paypal_sandbox_email' );
+		$live_email      = wpinv_get_option('paypal_email');
+		$sandbox_email   = wpinv_get_option('paypal_sandbox_email');
 
 		$admin_settings['paypal_connect'] = array(
 			'type'       => 'raw_html',
 			'id'         => 'paypal_connect',
-			'name'       => __( 'Connect to PayPal', 'invoicing' ),
+			'name'       => __('Connect to PayPal', 'invoicing'),
 			'desc'       => sprintf(
 				'<div class="wpinv-paypal-connect-live"><a class="button button-primary" href="%s">%s</a></div><div class="wpinv-paypal-connect-sandbox"><a class="button button-primary" href="%s">%s</a></div>%s',
-				esc_url( self::get_connect_url( false ) ),
-				__( 'Connect to PayPal', 'invoicing' ),
-				esc_url( self::get_connect_url( true ) ),
-				__( 'Connect to PayPal Sandox', 'invoicing' ),
+				esc_url(self::get_connect_url(false)),
+				__('Connect to PayPal', 'invoicing'),
+				esc_url(self::get_connect_url(true)),
+				__('Connect to PayPal Sandox', 'invoicing'),
 				$this->get_js()
 			),
 		);
@@ -533,25 +533,25 @@ 
             'type'  => 'text',
 			'class' => 'live-auth-data',
             'id'    => 'paypal_email',
-            'name'  => __( 'Live Email Address', 'invoicing' ),
-            'desc'  => __( 'The email address of your PayPal account.', 'invoicing' ),
+            'name'  => __('Live Email Address', 'invoicing'),
+            'desc'  => __('The email address of your PayPal account.', 'invoicing'),
         );
 
 		$admin_settings['paypal_sandbox_email'] = array(
             'type'  => 'text',
 			'class' => 'sandbox-auth-data',
             'id'    => 'paypal_sandbox_email',
-            'name'  => __( 'Sandbox Email Address', 'invoicing' ),
-            'desc'  => __( 'The email address of your sandbox PayPal account.', 'invoicing' ),
-			'std'   => wpinv_get_option( 'paypal_email', '' ),
+            'name'  => __('Sandbox Email Address', 'invoicing'),
+            'desc'  => __('The email address of your sandbox PayPal account.', 'invoicing'),
+			'std'   => wpinv_get_option('paypal_email', ''),
         );
 
         $admin_settings['paypal_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'paypal_ipn_url',
-            'name'     => __( 'IPN Url', 'invoicing' ),
+            'name'     => __('IPN Url', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( "If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing' ) . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'desc'     => __("If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing') . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
             'readonly' => true,
         );
 
@@ -565,8 +565,8 @@ 
      * @param array $data
      * @return string
 	 */
-	public static function maybe_get_connect_url( $url = '', $data = array() ) {
-		return self::get_connect_url( false, urldecode( $data['redirect'] ) );
+	public static function maybe_get_connect_url($url = '', $data = array()) {
+		return self::get_connect_url(false, urldecode($data['redirect']));
 	}
 
 	/**
@@ -577,25 +577,25 @@ 
 	 * @param string $redirect
      * @return string
 	 */
-	public static function get_connect_url( $is_sandbox, $redirect = '' ) {
+	public static function get_connect_url($is_sandbox, $redirect = '') {
 
         $redirect_url = add_query_arg(
             array(
                 'getpaid-admin-action' => 'connect_paypal',
                 'page'                 => 'wpinv-settings',
-                'live_mode'            => (int) empty( $is_sandbox ),
+                'live_mode'            => (int) empty($is_sandbox),
                 'tab'                  => 'gateways',
                 'section'              => 'paypal',
-                'getpaid-nonce'        => wp_create_nonce( 'getpaid-nonce' ),
-				'redirect'             => urlencode( $redirect ),
+                'getpaid-nonce'        => wp_create_nonce('getpaid-nonce'),
+				'redirect'             => urlencode($redirect),
             ),
-            admin_url( 'admin.php' )
+            admin_url('admin.php')
         );
 
         return add_query_arg(
             array(
-                'live_mode'    => (int) empty( $is_sandbox ),
-                'redirect_url' => urlencode( str_replace( '&amp;', '&', $redirect_url ) )
+                'live_mode'    => (int) empty($is_sandbox),
+                'redirect_url' => urlencode(str_replace('&amp;', '&', $redirect_url))
             ),
             'https://ayecode.io/oauth/paypal'
         );
@@ -649,26 +649,26 @@ 
 	 * @param array $data Connection data.
 	 * @return void
 	 */
-	public function connect_paypal( $data ) {
+	public function connect_paypal($data) {
 
 		$sandbox      = $this->is_sandbox();
-		$data         = wp_unslash( $data );
-		$access_token = empty( $data['access_token'] ) ? '' : sanitize_text_field( $data['access_token'] );
+		$data         = wp_unslash($data);
+		$access_token = empty($data['access_token']) ? '' : sanitize_text_field($data['access_token']);
 
-		if ( isset( $data['live_mode'] ) ) {
-			$sandbox = empty( $data['live_mode'] );
+		if (isset($data['live_mode'])) {
+			$sandbox = empty($data['live_mode']);
 		}
 
-		wpinv_update_option( 'paypal_sandbox', (int) $sandbox );
-		wpinv_update_option( 'paypal_active', 1 );
+		wpinv_update_option('paypal_sandbox', (int) $sandbox);
+		wpinv_update_option('paypal_active', 1);
 
-		if ( ! empty( $data['error_description'] ) ) {
-			getpaid_admin()->show_error( wp_kses_post( urldecode( $data['error_description'] ) ) );
+		if (!empty($data['error_description'])) {
+			getpaid_admin()->show_error(wp_kses_post(urldecode($data['error_description'])));
 		} else {
 
 			// Retrieve the user info.
 			$user_info = wp_remote_get(
-				! $sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
+				!$sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
 				array(
 
 					'headers' => array(
@@ -679,35 +679,35 @@ 
 				)
 			);
 
-			if ( is_wp_error( $user_info ) ) {
-				getpaid_admin()->show_error( wp_kses_post( $user_info->get_error_message() ) );
+			if (is_wp_error($user_info)) {
+				getpaid_admin()->show_error(wp_kses_post($user_info->get_error_message()));
 			} else {
 
 				// Create application.
-				$user_info = json_decode( wp_remote_retrieve_body( $user_info ) );
+				$user_info = json_decode(wp_remote_retrieve_body($user_info));
 
-				if ( $sandbox ) {
-					wpinv_update_option( 'paypal_sandbox_email', sanitize_email( $user_info->emails[0]->value ) );
-					wpinv_update_option( 'paypal_sandbox_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-					set_transient( 'getpaid_paypal_sandbox_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-					getpaid_admin()->show_success( __( 'Successfully connected your PayPal sandbox account', 'invoicing' ) );
+				if ($sandbox) {
+					wpinv_update_option('paypal_sandbox_email', sanitize_email($user_info->emails[0]->value));
+					wpinv_update_option('paypal_sandbox_refresh_token', sanitize_text_field(urldecode($data['refresh_token'])));
+					set_transient('getpaid_paypal_sandbox_access_token', sanitize_text_field(urldecode($data['access_token'])), (int) $data['expires_in']);
+					getpaid_admin()->show_success(__('Successfully connected your PayPal sandbox account', 'invoicing'));
 				} else {
-					wpinv_update_option( 'paypal_email', sanitize_email( $user_info->emails[0]->value ) );
-					wpinv_update_option( 'paypal_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-					set_transient( 'getpaid_paypal_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-					getpaid_admin()->show_success( __( 'Successfully connected your PayPal account', 'invoicing' ) );
+					wpinv_update_option('paypal_email', sanitize_email($user_info->emails[0]->value));
+					wpinv_update_option('paypal_refresh_token', sanitize_text_field(urldecode($data['refresh_token'])));
+					set_transient('getpaid_paypal_access_token', sanitize_text_field(urldecode($data['access_token'])), (int) $data['expires_in']);
+					getpaid_admin()->show_success(__('Successfully connected your PayPal account', 'invoicing'));
 				}
 
 			}
 
 		}
 
-		$redirect = empty( $data['redirect'] ) ? admin_url( 'admin.php?page=wpinv-settings&tab=gateways&section=paypal' ) : urldecode( $data['redirect'] );
+		$redirect = empty($data['redirect']) ? admin_url('admin.php?page=wpinv-settings&tab=gateways&section=paypal') : urldecode($data['redirect']);
 
-		if ( isset( $data['step'] ) ) {
-			$redirect = add_query_arg( 'step', $data['step'], $redirect );
+		if (isset($data['step'])) {
+			$redirect = add_query_arg('step', $data['step'], $redirect);
 		}
-		wp_redirect( $redirect );
+		wp_redirect($redirect);
 		exit;
 	}
 

includes/deprecated-functions.php

Spacing +93 added lines, -93 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * @deprecated
@@ -19,48 +19,48 @@ 
  * @deprecated
  */
 function wpinv_get_invoice_cart() {
-    return wpinv_get_invoice( getpaid_get_current_invoice_id() );
+    return wpinv_get_invoice(getpaid_get_current_invoice_id());
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_description( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_description($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_description();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_currency_code( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_currency_code($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_currency();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_payment_user_email( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_user_email($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_email();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_user_id( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_user_id($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_user_id();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_status( $invoice, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_status($invoice, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice);
     
-    if ( $return_label ) {
+    if ($return_label) {
         return $invoice->get_status_nicename();
     }
 
@@ -70,10 +70,10 @@ 
 /**
  * @deprecated
  */
-function wpinv_get_payment_gateway( $invoice, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_gateway($invoice, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice);
 
-    if ( $return_label ) {
+    if ($return_label) {
         return $invoice->get_gateway_title();
     }
 
@@ -83,75 +83,75 @@ 
 /**
  * @deprecated
  */
-function wpinv_get_payment_gateway_name( $invoice ) {
-    return wpinv_get_payment_gateway( $invoice, true );
+function wpinv_get_payment_gateway_name($invoice) {
+    return wpinv_get_payment_gateway($invoice, true);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_payment_transaction_id( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_transaction_id($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_transaction_id();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_meta( $invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
-    return $invoice->get_meta( $meta_key, $single );
+function wpinv_get_invoice_meta($invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true) {
+    $invoice = new WPInv_Invoice($invoice_id);
+    return $invoice->get_meta($meta_key, $single);
 }
 
 /**
  * @deprecated
  */
-function wpinv_update_invoice_meta( $invoice_id = 0, $meta_key = '', $meta_value = '' ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
-    return $invoice->update_meta_data( $meta_key, $meta_value );
+function wpinv_update_invoice_meta($invoice_id = 0, $meta_key = '', $meta_value = '') {
+    $invoice = new WPInv_Invoice($invoice_id);
+    return $invoice->update_meta_data($meta_key, $meta_value);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_items( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_items($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_items();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_fees( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_fees($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_fees();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_ip( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_ip($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_ip();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_user_info( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_user_info($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_user_info();
 }
 
 /**
  * @deprecated
  */
-function wpinv_subtotal( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_subtotal($invoice = 0, $currency = false) {
+    $invoice  = new WPInv_Invoice($invoice);
     $subtotal = $invoice->get_subtotal();
 
-    if ( $currency ) {
-        return wpinv_price( $subtotal, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($subtotal, $invoice->get_currency());
     }
 
     return $subtotal;
@@ -160,12 +160,12 @@ 
 /**
  * @deprecated
  */
-function wpinv_tax( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_tax($invoice = 0, $currency = false) {
+    $invoice  = new WPInv_Invoice($invoice);
     $tax      = $invoice->get_total_tax();
 
-    if ( $currency ) {
-        return wpinv_price( $tax, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($tax, $invoice->get_currency());
     }
 
     return $tax;
@@ -174,12 +174,12 @@ 
 /**
  * @deprecated
  */
-function wpinv_discount( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_discount($invoice = 0, $currency = false) {
+    $invoice  = new WPInv_Invoice($invoice);
     $discount = $invoice->get_total_discount();
 
-    if ( $currency ) {
-        return wpinv_price( $discount, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($discount, $invoice->get_currency());
     }
 
     return $discount;
@@ -188,20 +188,20 @@ 
 /**
  * @deprecated
  */
-function wpinv_discount_code( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_discount_code($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_discount_code();
 }
 
 /**
  * @deprecated
  */
-function wpinv_payment_total( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_payment_total($invoice = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice);
     $total = $invoice->get_total();
 
-    if ( $currency ) {
-        return wpinv_price( $total, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($total, $invoice->get_currency());
     }
 
     return $total;
@@ -210,51 +210,51 @@ 
 /**
  * @deprecated
  */
-function wpinv_get_date_created( $invoice = 0, $format = '' ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_date_created($invoice = 0, $format = '') {
+    $invoice = new WPInv_Invoice($invoice);
 
-    $format         = ! empty( $format ) ? $format : get_option( 'date_format' );
+    $format         = !empty($format) ? $format : get_option('date_format');
     $date_created   = $invoice->get_created_date();
 
-    return empty( $date_created ) ? date_i18n( $format, strtotime( $date_created ) ) : '';
+    return empty($date_created) ? date_i18n($format, strtotime($date_created)) : '';
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_date( $invoice = 0, $format = '' ) {
-    wpinv_get_date_created( $invoice, $format );
+function wpinv_get_invoice_date($invoice = 0, $format = '') {
+    wpinv_get_date_created($invoice, $format);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_vat_number( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_vat_number($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_vat_number();
 }
 
 /**
  * @deprecated
  */
-function wpinv_insert_payment_note( $invoice = 0, $note = '', $user_type = false, $added_by_user = false, $system = false ) {
-    $invoice = new WPInv_Invoice( $invoice );
-    return $invoice->add_note( $note, $user_type, $added_by_user, $system );
+function wpinv_insert_payment_note($invoice = 0, $note = '', $user_type = false, $added_by_user = false, $system = false) {
+    $invoice = new WPInv_Invoice($invoice);
+    return $invoice->add_note($note, $user_type, $added_by_user, $system);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_payment_key( $invoice = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_key($invoice = 0) {
+	$invoice = new WPInv_Invoice($invoice);
     return $invoice->get_key();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_number( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_number($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_number();
 }
 
@@ -401,9 +401,9 @@ 
 /**
  * @deprecated
  */
-function wpinv_update_payment_status( $invoice, $new_status = 'publish' ) {    
-    $invoice = new WPInv_Invoice( $invoice );
-    return $invoice->update_status( $new_status );
+function wpinv_update_payment_status($invoice, $new_status = 'publish') {    
+    $invoice = new WPInv_Invoice($invoice);
+    return $invoice->update_status($new_status);
 }
 
 /**
@@ -456,22 +456,22 @@ 
 /**
  * @deprecated
  */
-function wpinv_set_payment_transaction_id( $invoice_id = 0, $transaction_id = '' ) {
+function wpinv_set_payment_transaction_id($invoice_id = 0, $transaction_id = '') {
 
     // Fetch the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    if ( 0 ==  $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return false;
     }
 
     // Prepare the transaction id.
-    if ( empty( $transaction_id ) ) {
+    if (empty($transaction_id)) {
         $transaction_id = $invoice_id;
     }
 
     // Set the transaction id;
-    $invoice->set_transaction_id( apply_filters( 'wpinv_set_payment_transaction_id', $transaction_id, $invoice ) );
+    $invoice->set_transaction_id(apply_filters('wpinv_set_payment_transaction_id', $transaction_id, $invoice));
 
     // Save the invoice.
     return $invoice->save();
@@ -484,12 +484,12 @@ 
  * @param WPInv_Invoice $invoice
  * @param string $gateway
  */
-function wpinv_send_to_gateway( $gateway, $invoice ) {
+function wpinv_send_to_gateway($gateway, $invoice) {
 
     $payment_data = array(
         'invoice_id'        => $invoice->get_id(),
         'items'             => $invoice->get_cart_details(),
-        'cart_discounts'    => array( $invoice->get_discount_code() ),
+        'cart_discounts'    => array($invoice->get_discount_code()),
         'fees'              => $invoice->get_total_fees(),
         'subtotal'          => $invoice->get_subtotal(),
         'discount'          => $invoice->get_total_discount(),
@@ -497,16 +497,16 @@ 
         'price'             => $invoice->get_total(),
         'invoice_key'       => $invoice->get_key(),
         'user_email'        => $invoice->get_email(),
-        'date'              => date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ),
+        'date'              => date('Y-m-d H:i:s', current_time('timestamp')),
         'user_info'         => $invoice->get_user_info(),
-        'post_data'         => stripslashes_deep( $_POST ),
+        'post_data'         => stripslashes_deep($_POST),
         'cart_details'      => $invoice->get_cart_details(),
         'gateway'           => $gateway,
         'card_info'         => array(),
         'gateway_nonce'     => wp_create_nonce('wpi-gateway'),
     );
 
-    do_action( 'wpinv_gateway_' . $gateway, $payment_data );
+    do_action('wpinv_gateway_' . $gateway, $payment_data);
 }
 
 /**
@@ -519,10 +519,10 @@ 
 /**
  * @deprecated
  */
-function wpinv_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', 'wpinv_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', 'wpinv_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function wpinv_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', 'wpinv_die_handler', 10, 3);
+    add_filter('wp_die_handler', 'wpinv_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
 
 /**
@@ -640,14 +640,14 @@ 
 /**
  * @deprecated
  */
-function wpinv_invoice_status_label( $status, $status_display = '' ) {
-    return empty( $status_display ) ? sanitize_text_field( $status ) : sanitize_text_field( $status_display );
+function wpinv_invoice_status_label($status, $status_display = '') {
+    return empty($status_display) ? sanitize_text_field($status) : sanitize_text_field($status_display);
 }
 
 /**
  * @deprecated
  */
-function wpinv_clean_invoice_number( $number ) {
+function wpinv_clean_invoice_number($number) {
     return $number;
 }
 
@@ -852,12 +852,12 @@ 
 /**
  * @deprecated
  */
-function wpinv_item_show_price( $item_id = 0, $echo = true ) {
+function wpinv_item_show_price($item_id = 0, $echo = true) {
 
-    if ( $echo ) {
-        echo wpinv_item_price( $item_id );
+    if ($echo) {
+        echo wpinv_item_price($item_id);
     } else {
-        return wpinv_item_price( $item_id );
+        return wpinv_item_price($item_id);
     }
 
 }
@@ -1272,6 +1272,6 @@ 
  * @return WPInv_Subscription|bool
  * @deprecated
  */
-function wpinv_get_subscription( $invoice ) {
-	return wpinv_get_invoice_subscription( $invoice );
+function wpinv_get_subscription($invoice) {
+	return wpinv_get_invoice_subscription($invoice);
 }

includes/gateways/class-getpaid-authorize-net-legacy-gateway.php

Spacing +68 added lines, -68 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Authorize.net Legacy Payment Gateway class.
@@ -28,8 +28,8 @@ 
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return string
 	 */
-	public function get_api_url( $invoice ) {
-        return $this->is_sandbox( $invoice ) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
+	public function get_api_url($invoice) {
+        return $this->is_sandbox($invoice) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
     }
 
     /**
@@ -40,48 +40,48 @@ 
      * @param WPInv_Invoice $invoice Invoice.
 	 * @return stdClass|WP_Error
 	 */
-    public function post( $post, $invoice ){
+    public function post($post, $invoice) {
 
-        $url      = $this->get_api_url( $invoice );
+        $url      = $this->get_api_url($invoice);
         $response = wp_remote_post(
             $url,
             array(
                 'headers'          => array(
                     'Content-Type' => 'application/json; charset=utf-8'
                 ),
-                'body'             => json_encode( $post ),
+                'body'             => json_encode($post),
                 'method'           => 'POST'
             )
         );
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
             return $response;
         }
 
-        $response = wp_unslash( wp_remote_retrieve_body( $response ) );
+        $response = wp_unslash(wp_remote_retrieve_body($response));
         $response = preg_replace('/\xEF\xBB\xBF/', '', $response); // https://community.developer.authorize.net/t5/Integration-and-Testing/JSON-issues/td-p/48851
-        $response = json_decode( $response );
+        $response = json_decode($response);
 
-        if ( empty( $response ) ) {
-            return new WP_Error( 'invalid_reponse', __( 'Invalid gateway response', 'invoicing' ) );
+        if (empty($response)) {
+            return new WP_Error('invalid_reponse', __('Invalid gateway response', 'invoicing'));
         }
 
-        if ( $response->messages->resultCode == 'Error' ) {
+        if ($response->messages->resultCode == 'Error') {
 
-            if ( $this->is_sandbox( $invoice ) ) {
-                wpinv_error_log( $response );
+            if ($this->is_sandbox($invoice)) {
+                wpinv_error_log($response);
             }
 
-            if ( $response->messages->message[0]->code == 'E00039' && ! empty( $response->customerProfileId )  && ! empty( $response->customerPaymentProfileId ) ) {
-                return new WP_Error( 'dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId );
+            if ($response->messages->message[0]->code == 'E00039' && !empty($response->customerProfileId) && !empty($response->customerPaymentProfileId)) {
+                return new WP_Error('dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId);
             }
 
-            if ( ! empty( $response->transactionResponse ) && ! empty( $response->transactionResponse->errors ) ) {
+            if (!empty($response->transactionResponse) && !empty($response->transactionResponse->errors)) {
                 $error = $response->transactionResponse->errors[0];
-                return new WP_Error( $error->errorCode, $error->errorText );
+                return new WP_Error($error->errorCode, $error->errorText);
             }
 
-            return new WP_Error( $response->messages->message[0]->code, $response->messages->message[0]->text );
+            return new WP_Error($response->messages->message[0]->code, $response->messages->message[0]->text);
         }
 
         return $response;
@@ -97,8 +97,8 @@ 
 	public function get_auth_params() {
 
         return array(
-            'name'           => $this->get_option( 'login_id' ),
-            'transactionKey' => $this->get_option( 'transaction_key' ),
+            'name'           => $this->get_option('login_id'),
+            'transactionKey' => $this->get_option('transaction_key'),
         );
 
     }
@@ -110,7 +110,7 @@ 
 	 * @param WPInv_Subscription $subscription Subscription.
      * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function cancel_subscription( $subscription, $invoice ) {
+	public function cancel_subscription($subscription, $invoice) {
 
         // Backwards compatibility. New version do not use authorize.net subscriptions.
         $this->post(
@@ -135,38 +135,38 @@ 
         $this->maybe_process_old_ipn();
 
         // Validate the IPN.
-        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
+        if (empty($_POST) || !$this->validate_ipn()) {
+		    wp_die('Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array('response' => 200));
         }
 
         // Event type.
-        $posted = json_decode( file_get_contents( 'php://input' ) );
-        if ( empty( $posted ) ) {
-            wp_die( 'Invalid JSON', 'Authorize.NET IPN', array( 'response' => 200 ) );
+        $posted = json_decode(file_get_contents('php://input'));
+        if (empty($posted)) {
+            wp_die('Invalid JSON', 'Authorize.NET IPN', array('response' => 200));
         }
 
         // Process the IPN.
-        $posted = (object) wp_unslash( $posted );
+        $posted = (object) wp_unslash($posted);
 
         // Process refunds.
-        if ( 'net.authorize.payment.refund.created' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->merchantReferenceId );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
+        if ('net.authorize.payment.refund.created' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->merchantReferenceId);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
             $invoice->refund();
         }
 
         // Held funds approved.
-        if ( 'net.authorize.payment.fraud.approved' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->id );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
-            $invoice->mark_paid( false, __( 'Payment released', 'invoicing' ) );
+        if ('net.authorize.payment.fraud.approved' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->id);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
+            $invoice->mark_paid(false, __('Payment released', 'invoicing'));
         }
 
         // Held funds declined.
-        if ( 'net.authorize.payment.fraud.declined' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->id );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
-            $invoice->set_status( 'wpi-failed', __( 'Payment declined', 'invoicing' ) );
+        if ('net.authorize.payment.fraud.declined' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->id);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
+            $invoice->set_status('wpi-failed', __('Payment declined', 'invoicing'));
             $invoice->save();
         }
 
@@ -181,8 +181,8 @@ 
      * @param object $payload
 	 * @return void
 	 */
-	public function validate_ipn_invoice( $invoice, $payload ) {
-        if ( ! $invoice->exists() || $payload->id != $invoice->get_transaction_id() ) {
+	public function validate_ipn_invoice($invoice, $payload) {
+        if (!$invoice->exists() || $payload->id != $invoice->get_transaction_id()) {
             exit;
         }
     }
@@ -194,32 +194,32 @@ 
 	 */
 	public function maybe_process_old_ipn() {
 
-        $data = wp_kses_post_deep( wp_unslash( $_POST ) );
+        $data = wp_kses_post_deep(wp_unslash($_POST));
 
         // Only process subscriptions subscriptions.
-        if ( empty( $data['x_subscription_id'] ) ) {
+        if (empty($data['x_subscription_id'])) {
             return;
         }
 
         // Check validity.
-        $this->validate_old_ipn_signature( $data );
+        $this->validate_old_ipn_signature($data);
 
         // Fetch the associated subscription.
-        $subscription_id = WPInv_Subscription::get_subscription_id_by_field( $data['x_subscription_id'] );
-        $subscription    = new WPInv_Subscription( $subscription_id );
+        $subscription_id = WPInv_Subscription::get_subscription_id_by_field($data['x_subscription_id']);
+        $subscription    = new WPInv_Subscription($subscription_id);
 
         // Abort if it is missing or completed.
-        if ( ! $subscription->get_id() || $subscription->has_status( 'completed' ) ) {
+        if (!$subscription->get_id() || $subscription->has_status('completed')) {
             return;
         }
 
         // Payment status.
-        if ( 1 == $data['x_response_code'] ) {
+        if (1 == $data['x_response_code']) {
 
             // Renew the subscription.
             $subscription->add_payment(
                 array(
-                    'transaction_id' => sanitize_text_field( $data['x_trans_id'] ),
+                    'transaction_id' => sanitize_text_field($data['x_trans_id']),
                     'gateway'        => $this->id
                 )
             );
@@ -238,17 +238,17 @@ 
      *
      * @param array $posted
 	 */
-	public function validate_old_ipn_signature( $posted ) {
+	public function validate_old_ipn_signature($posted) {
 
-        $signature = $this->get_option( 'signature_key' );
-        if ( ! empty( $signature ) ) {
-            $login_id  = $this->get_option( 'login_id' );
-            $trans_id  = wpinv_clean( $_POST['x_trans_id'] );
-            $amount    = wpinv_clean( $_POST['x_amount'] );
-            $hash      = hash_hmac ( 'sha512', "^$login_id^$trans_id^$amount^", hex2bin( $signature ) );
+        $signature = $this->get_option('signature_key');
+        if (!empty($signature)) {
+            $login_id  = $this->get_option('login_id');
+            $trans_id  = wpinv_clean($_POST['x_trans_id']);
+            $amount    = wpinv_clean($_POST['x_amount']);
+            $hash      = hash_hmac('sha512', "^$login_id^$trans_id^$amount^", hex2bin($signature));
 
-            if ( ! hash_equals( $hash, $posted['x_SHA2_Hash'] ) ) {
-                wpinv_error_log( $posted['x_SHA2_Hash'], "Invalid signature. Expected $hash" );
+            if (!hash_equals($hash, $posted['x_SHA2_Hash'])) {
+                wpinv_error_log($posted['x_SHA2_Hash'], "Invalid signature. Expected $hash");
                 exit;
             }
 
@@ -261,28 +261,28 @@ 
 	 */
 	public function validate_ipn() {
 
-        wpinv_error_log( 'Validating Authorize.NET IPN response' );
+        wpinv_error_log('Validating Authorize.NET IPN response');
 
-        if ( empty( $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
+        if (empty($_SERVER['HTTP_X_ANET_SIGNATURE'])) {
             return false;
         }
 
-        $signature = $this->get_option( 'signature_key' );
+        $signature = $this->get_option('signature_key');
 
-        if ( empty( $signature ) ) {
-            wpinv_error_log( 'Error: You have not set a signature key' );
+        if (empty($signature)) {
+            wpinv_error_log('Error: You have not set a signature key');
             return false;
         }
 
-        $hash  = hash_hmac ( 'sha512', file_get_contents( 'php://input' ), hex2bin( $signature ) );
+        $hash = hash_hmac('sha512', file_get_contents('php://input'), hex2bin($signature));
 
-        if ( hash_equals( $hash, $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
-            wpinv_error_log( 'Successfully validated the IPN' );
+        if (hash_equals($hash, $_SERVER['HTTP_X_ANET_SIGNATURE'])) {
+            wpinv_error_log('Successfully validated the IPN');
             return true;
         }
 
-        wpinv_error_log( 'IPN hash is not valid' );
-        wpinv_error_log(  $_SERVER['HTTP_X_ANET_SIGNATURE']  );
+        wpinv_error_log('IPN hash is not valid');
+        wpinv_error_log($_SERVER['HTTP_X_ANET_SIGNATURE']);
         return false;
 
     }

includes/gateways/class-getpaid-payment-gateway.php

Spacing +127 added lines, -127 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Abstaract Payment Gateway class.
@@ -139,51 +139,51 @@ 
 	public function __construct() {
 
 		// Register gateway.
-		add_filter( 'wpinv_payment_gateways', array( $this, 'register_gateway' ) );
+		add_filter('wpinv_payment_gateways', array($this, 'register_gateway'));
 
-		$this->enabled = wpinv_is_gateway_active( $this->id );
+		$this->enabled = wpinv_is_gateway_active($this->id);
 
 		// Add support for various features.
-		foreach ( $this->supports as $feature ) {
-			add_filter( "wpinv_{$this->id}_support_{$feature}", '__return_true' );
-			add_filter( "getpaid_{$this->id}_support_{$feature}", '__return_true' );
-			add_filter( "getpaid_{$this->id}_supports_{$feature}", '__return_true' );
+		foreach ($this->supports as $feature) {
+			add_filter("wpinv_{$this->id}_support_{$feature}", '__return_true');
+			add_filter("getpaid_{$this->id}_support_{$feature}", '__return_true');
+			add_filter("getpaid_{$this->id}_supports_{$feature}", '__return_true');
 		}
 
 		// Invoice addons.
-		if ( $this->supports( 'addons' ) ) {
-			add_action( "getpaid_process_{$this->id}_invoice_addons", array( $this, 'process_addons' ), 10, 2 );
+		if ($this->supports('addons')) {
+			add_action("getpaid_process_{$this->id}_invoice_addons", array($this, 'process_addons'), 10, 2);
 		}
 
 		// Gateway settings.
-		add_filter( "wpinv_gateway_settings_{$this->id}", array( $this, 'admin_settings' ) );
+		add_filter("wpinv_gateway_settings_{$this->id}", array($this, 'admin_settings'));
 		
 
 		// Gateway checkout fiellds.
-		add_action( "wpinv_{$this->id}_cc_form", array( $this, 'payment_fields' ), 10, 2 );
+		add_action("wpinv_{$this->id}_cc_form", array($this, 'payment_fields'), 10, 2);
 
 		// Process payment.
-		add_action( "getpaid_gateway_{$this->id}", array( $this, 'process_payment' ), 10, 3 );
+		add_action("getpaid_gateway_{$this->id}", array($this, 'process_payment'), 10, 3);
 
 		// Change the checkout button text.
-		if ( ! empty( $this->checkout_button_text ) ) {
-			add_filter( "getpaid_gateway_{$this->id}_checkout_button_label", array( $this, 'rename_checkout_button' ) );
+		if (!empty($this->checkout_button_text)) {
+			add_filter("getpaid_gateway_{$this->id}_checkout_button_label", array($this, 'rename_checkout_button'));
 		}
 
 		// Check if a gateway is valid for a given currency.
-		add_filter( "getpaid_gateway_{$this->id}_is_valid_for_currency", array( $this, 'validate_currency' ), 10, 2 );
+		add_filter("getpaid_gateway_{$this->id}_is_valid_for_currency", array($this, 'validate_currency'), 10, 2);
 
 		// Generate the transaction url.
-		add_filter( "getpaid_gateway_{$this->id}_transaction_url", array( $this, 'filter_transaction_url' ), 10, 2 );
+		add_filter("getpaid_gateway_{$this->id}_transaction_url", array($this, 'filter_transaction_url'), 10, 2);
 
 		// Generate the subscription url.
-		add_filter( 'getpaid_remote_subscription_profile_url', array( $this, 'generate_subscription_url' ), 10, 2 );
+		add_filter('getpaid_remote_subscription_profile_url', array($this, 'generate_subscription_url'), 10, 2);
 
 		// Confirm payments.
-		add_filter( "wpinv_payment_confirm_{$this->id}", array( $this, 'confirm_payment' ), 10, 2 );
+		add_filter("wpinv_payment_confirm_{$this->id}", array($this, 'confirm_payment'), 10, 2);
 
 		// Verify IPNs.
-		add_action( "wpinv_verify_{$this->id}_ipn", array( $this, 'verify_ipn' ) );
+		add_action("wpinv_verify_{$this->id}_ipn", array($this, 'verify_ipn'));
 
 	}
 
@@ -193,7 +193,7 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function is( $gateway ) {
+	public function is($gateway) {
 		return $gateway == $this->id;
 	}
 
@@ -203,24 +203,24 @@ 
 	 * @since 1.0.19
 	 * @return array
 	 */
-	public function get_tokens( $sandbox = null ) {
+	public function get_tokens($sandbox = null) {
 
-		if ( is_user_logged_in() && $this->supports( 'tokens' ) && 0 == count( $this->tokens ) ) {
-			$tokens = get_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", true );
+		if (is_user_logged_in() && $this->supports('tokens') && 0 == count($this->tokens)) {
+			$tokens = get_user_meta(get_current_user_id(), "getpaid_{$this->id}_tokens", true);
 
-			if ( is_array( $tokens ) ) {
+			if (is_array($tokens)) {
 				$this->tokens = $tokens;
 			}
 
 		}
 
-		if ( ! is_bool( $sandbox ) ) {
+		if (!is_bool($sandbox)) {
 			return $this->tokens;
 		}
 
 		// Filter tokens.
-		$args = array( 'type' => $sandbox ? 'sandbox' : 'live' );
-		return wp_list_filter( $this->tokens, $args );
+		$args = array('type' => $sandbox ? 'sandbox' : 'live');
+		return wp_list_filter($this->tokens, $args);
 
 	}
 
@@ -229,12 +229,12 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function save_token( $token ) {
+	public function save_token($token) {
 
 		$tokens   = $this->get_tokens();
 		$tokens[] = $token;
 
-		update_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", $tokens );
+		update_user_meta(get_current_user_id(), "getpaid_{$this->id}_tokens", $tokens);
 
 		$this->tokens = $tokens;
 
@@ -246,7 +246,7 @@ 
 	 * @return string
 	 */
 	public function get_method_title() {
-		return apply_filters( 'getpaid_gateway_method_title', $this->method_title, $this );
+		return apply_filters('getpaid_gateway_method_title', $this->method_title, $this);
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 * @return string
 	 */
 	public function get_method_description() {
-		return apply_filters( 'getpaid_gateway_method_description', $this->method_description, $this );
+		return apply_filters('getpaid_gateway_method_description', $this->method_description, $this);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_return_url( $invoice ) {
+	public function get_return_url($invoice) {
 
 		// Payment success url
 		$return_url = add_query_arg(
@@ -276,7 +276,7 @@ 
 			wpinv_get_success_page_uri()
 		);
 
-		return apply_filters( 'getpaid_gateway_success_url', $return_url, $invoice, $this );
+		return apply_filters('getpaid_gateway_success_url', $return_url, $invoice, $this);
 	}
 
 	/**
@@ -285,24 +285,24 @@ 
 	 * @param string $content Success page content.
 	 * @return string
 	 */
-	public function confirm_payment( $content ) {
+	public function confirm_payment($content) {
 
 		// Retrieve the invoice.
 		$invoice_id = getpaid_get_current_invoice_id();
-		$invoice    = wpinv_get_invoice( $invoice_id );
+		$invoice    = wpinv_get_invoice($invoice_id);
 
 		// Ensure that it exists and that it is pending payment.
-		if ( empty( $invoice_id ) || ! $invoice->needs_payment() ) {
+		if (empty($invoice_id) || !$invoice->needs_payment()) {
 			return $content;
 		}
 
 		// Can the user view this invoice??
-		if ( ! wpinv_user_can_view_invoice( $invoice ) ) {
+		if (!wpinv_user_can_view_invoice($invoice)) {
 			return $content;
 		}
 
 		// Show payment processing indicator.
-		return wpinv_get_template_html( 'wpinv-payment-processing.php', compact( 'invoice' ) );
+		return wpinv_get_template_html('wpinv-payment-processing.php', compact('invoice'));
 	}
 
 	/**
@@ -319,7 +319,7 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
 	}
 
@@ -330,14 +330,14 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return string transaction URL, or empty string.
 	 */
-	public function filter_transaction_url( $transaction_url, $invoice ) {
+	public function filter_transaction_url($transaction_url, $invoice) {
 
-		$transaction_id  = $invoice->get_transaction_id();
+		$transaction_id = $invoice->get_transaction_id();
 
-		if ( ! empty( $this->view_transaction_url ) && ! empty( $transaction_id ) ) {
-			$transaction_url = sprintf( $this->view_transaction_url, $transaction_id );
-			$replace         = $this->is_sandbox( $invoice ) ? 'sandbox' : '';
-			$transaction_url = str_replace( '{sandbox}', $replace, $transaction_url );
+		if (!empty($this->view_transaction_url) && !empty($transaction_id)) {
+			$transaction_url = sprintf($this->view_transaction_url, $transaction_id);
+			$replace         = $this->is_sandbox($invoice) ? 'sandbox' : '';
+			$transaction_url = str_replace('{sandbox}', $replace, $transaction_url);
 		}
 
 		return $transaction_url;
@@ -350,15 +350,15 @@ 
 	 * @param WPInv_Subscription $subscription Subscription objectt.
 	 * @return string subscription URL, or empty string.
 	 */
-	public function generate_subscription_url( $subscription_url, $subscription ) {
+	public function generate_subscription_url($subscription_url, $subscription) {
 
-		$profile_id      = $subscription->get_profile_id();
+		$profile_id = $subscription->get_profile_id();
 
-		if ( $this->id == $subscription->get_gateway() && ! empty( $this->view_subscription_url ) && ! empty( $profile_id ) ) {
+		if ($this->id == $subscription->get_gateway() && !empty($this->view_subscription_url) && !empty($profile_id)) {
 
-			$subscription_url = sprintf( $this->view_subscription_url, $profile_id );
-			$replace          = $this->is_sandbox( $subscription->get_parent_invoice() ) ? 'sandbox' : '';
-			$subscription_url = str_replace( '{sandbox}', $replace, $subscription_url );
+			$subscription_url = sprintf($this->view_subscription_url, $profile_id);
+			$replace          = $this->is_sandbox($subscription->get_parent_invoice()) ? 'sandbox' : '';
+			$subscription_url = str_replace('{sandbox}', $replace, $subscription_url);
 
 		}
 
@@ -371,7 +371,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		return ! empty( $this->enabled );
+		return !empty($this->enabled);
 	}
 
 	/**
@@ -380,7 +380,7 @@ 
 	 * @return string
 	 */
 	public function get_title() {
-		return apply_filters( 'getpaid_gateway_title', $this->title, $this );
+		return apply_filters('getpaid_gateway_title', $this->title, $this);
 	}
 
 	/**
@@ -389,7 +389,7 @@ 
 	 * @return string
 	 */
 	public function get_description() {
-		return apply_filters( 'getpaid_gateway_description', $this->description, $this );
+		return apply_filters('getpaid_gateway_description', $this->description, $this);
 	}
 
 	/**
@@ -401,9 +401,9 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return void
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 		// Process the payment then either redirect to the success page or the gateway.
-		do_action( 'getpaid_process_invoice_payment_' . $this->id, $invoice, $submission_data, $submission );
+		do_action('getpaid_process_invoice_payment_' . $this->id, $invoice, $submission_data, $submission);
 	}
 
 	/**
@@ -417,8 +417,8 @@ 
 	 * @param  string $reason Refund reason.
 	 * @return WP_Error|bool True or false based on success, or a WP_Error object.
 	 */
-	public function process_refund( $invoice, $amount = null, $reason = '' ) {
-		return apply_filters( 'getpaid_process_invoice_refund_' . $this->id, false, $invoice, $amount, $reason );
+	public function process_refund($invoice, $amount = null, $reason = '') {
+		return apply_filters('getpaid_process_invoice_refund_' . $this->id, false, $invoice, $amount, $reason);
 	}
 
 	/**
@@ -427,8 +427,8 @@ 
 	 * @param int $invoice_id 0 or invoice id.
 	 * @param GetPaid_Payment_Form $form Current payment form.
 	 */
-	public function payment_fields( $invoice_id, $form ) {
-		do_action( 'getpaid_getpaid_gateway_payment_fields_' . $this->id, $invoice_id, $form );
+	public function payment_fields($invoice_id, $form) {
+		do_action('getpaid_getpaid_gateway_payment_fields_' . $this->id, $invoice_id, $form);
 	}
 
 	/**
@@ -436,7 +436,7 @@ 
 	 * 
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 		return $admin_settings;
 	}
 
@@ -445,8 +445,8 @@ 
 	 * 
 	 * @param string $option
 	 */
-	public function get_option( $option, $default = false ) {
-		return wpinv_get_option( $this->id . '_' . $option, $default );
+	public function get_option($option, $default = false) {
+		return wpinv_get_option($this->id . '_' . $option, $default);
 	}
 
 	/**
@@ -459,8 +459,8 @@ 
 	 * @return bool True if the gateway supports the feature, false otherwise.
 	 * @since 1.0.19
 	 */
-	public function supports( $feature ) {
-		return getpaid_payment_gateway_supports( $this->id, $feature );
+	public function supports($feature) {
+		return getpaid_payment_gateway_supports($this->id, $feature);
 	}
 
 	/**
@@ -468,36 +468,36 @@ 
 	 * 
 	 * @param bool $save whether or not to display the save button.
 	 */
-    public function get_cc_form( $save = false ) {
+    public function get_cc_form($save = false) {
 
 		ob_start();
 
-        $id_prefix = esc_attr( uniqid( $this->id ) );
+        $id_prefix = esc_attr(uniqid($this->id));
 
         $months = array(
-            '01' => __( 'January', 'invoicing' ),
-            '02' => __( 'February', 'invoicing' ),
-            '03' => __( 'March', 'invoicing' ),
-            '04' => __( 'April', 'invoicing' ),
-            '05' => __( 'May', 'invoicing' ),
-            '06' => __( 'June', 'invoicing' ),
-            '07' => __( 'July', 'invoicing' ),
-            '08' => __( 'August', 'invoicing' ),
-            '09' => __( 'September', 'invoicing' ),
-            '10' => __( 'October', 'invoicing' ),
-            '11' => __( 'November', 'invoicing' ),
-            '12' => __( 'December', 'invoicing' ),
+            '01' => __('January', 'invoicing'),
+            '02' => __('February', 'invoicing'),
+            '03' => __('March', 'invoicing'),
+            '04' => __('April', 'invoicing'),
+            '05' => __('May', 'invoicing'),
+            '06' => __('June', 'invoicing'),
+            '07' => __('July', 'invoicing'),
+            '08' => __('August', 'invoicing'),
+            '09' => __('September', 'invoicing'),
+            '10' => __('October', 'invoicing'),
+            '11' => __('November', 'invoicing'),
+            '12' => __('December', 'invoicing'),
         );
 
-        $year  = (int) date( 'Y', current_time( 'timestamp' ) );
+        $year  = (int) date('Y', current_time('timestamp'));
         $years = array();
 
-        for ( $i = 0; $i <= 10; $i++ ) {
-            $years[ $year + $i ] = $year + $i;
+        for ($i = 0; $i <= 10; $i++) {
+            $years[$year + $i] = $year + $i;
         }
 
         ?>
-            <div class="<?php echo esc_attr( $this->id );?>-cc-form getpaid-cc-form mt-1">
+            <div class="<?php echo esc_attr($this->id); ?>-cc-form getpaid-cc-form mt-1">
 
 
                 <div class="getpaid-cc-card-inner">
@@ -506,14 +506,14 @@ 
                         <div class="col-12">
 
 							<div class="form-group">
-								<label for="<?php echo esc_attr( "$id_prefix-cc-number" ) ?>"><?php _e( 'Card number', 'invoicing' ); ?></label>
+								<label for="<?php echo esc_attr("$id_prefix-cc-number") ?>"><?php _e('Card number', 'invoicing'); ?></label>
 								<div class="input-group input-group-sm">
 									<div class="input-group-prepend ">
 										<span class="input-group-text">
 											<i class="fa fa-credit-card"></i>
 										</span>
 									</div>
-									<input type="text" name="<?php echo esc_attr( $this->id . '[cc_number]' ) ?>" id="<?php echo esc_attr( "$id_prefix-cc-number" ) ?>" class="form-control form-control-sm" autocomplete="cc-number">
+									<input type="text" name="<?php echo esc_attr($this->id . '[cc_number]') ?>" id="<?php echo esc_attr("$id_prefix-cc-number") ?>" class="form-control form-control-sm" autocomplete="cc-number">
 								</div>
 							</div>
 
@@ -521,17 +521,17 @@ 
 
                         <div class="col-12">
                             <div class="form-group">
-                                <label><?php _e( 'Expiration', 'invoicing' ); ?></label>
+                                <label><?php _e('Expiration', 'invoicing'); ?></label>
                                 <div class="form-row">
 
                                     <div class="col">
-                                        <select class="form-control form-control-sm" autocomplete="cc-exp-month" name="<?php echo esc_attr( $this->id );?>[cc_expire_month]">
-                                            <option disabled selected="selected"><?php _e( 'MM', 'invoicing' ); ?></option>
+                                        <select class="form-control form-control-sm" autocomplete="cc-exp-month" name="<?php echo esc_attr($this->id); ?>[cc_expire_month]">
+                                            <option disabled selected="selected"><?php _e('MM', 'invoicing'); ?></option>
 
                                             <?php
-                                                foreach ( $months as $key => $month ) {
-                                                    $key   = esc_attr( $key );
-                                                    $month = wpinv_clean( $month );
+                                                foreach ($months as $key => $month) {
+                                                    $key   = esc_attr($key);
+                                                    $month = wpinv_clean($month);
                                                     echo "<option value='$key'>$month</option>" . PHP_EOL;
                                                 }
                                             ?>
@@ -540,13 +540,13 @@ 
                                     </div>
 
                                     <div class="col">
-                                        <select class="form-control form-control-sm" autocomplete="cc-exp-year" name="<?php echo esc_attr( $this->id );?>[cc_expire_year]">
-                                            <option disabled selected="selected"><?php _e( 'YY', 'invoicing' ); ?></option>
+                                        <select class="form-control form-control-sm" autocomplete="cc-exp-year" name="<?php echo esc_attr($this->id); ?>[cc_expire_year]">
+                                            <option disabled selected="selected"><?php _e('YY', 'invoicing'); ?></option>
 
                                             <?php
-                                                foreach ( $years as $key => $year ) {
-                                                    $key   = esc_attr( $key );
-                                                    $year  = wpinv_clean( $year );
+                                                foreach ($years as $key => $year) {
+                                                    $key   = esc_attr($key);
+                                                    $year  = wpinv_clean($year);
                                                     echo "<option value='$key'>$year</option>" . PHP_EOL;
                                                 }
                                             ?>
@@ -564,7 +564,7 @@ 
                                     array(
                                         'name'              => $this->id . '[cc_cvv2]',
                                         'id'                => "$id_prefix-cc-cvv2",
-                                        'label'             => __( 'CCV', 'invoicing' ),
+                                        'label'             => __('CCV', 'invoicing'),
 										'label_type'        => 'vertical',
 										'class'             => 'form-control-sm',
 										'extra_attributes'  => array(
@@ -579,7 +579,7 @@ 
 					
 					<?php
 
-						if ( $save ) {
+						if ($save) {
 							echo $this->save_payment_method_checkbox();
 						}
 
@@ -598,7 +598,7 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function new_payment_method_entry( $form ) {
+	public function new_payment_method_entry($form) {
 		echo "<div class='getpaid-new-payment-method-form' style='display:none;'>$form</div>";
 	}
 
@@ -608,16 +608,16 @@ 
 	 * @since 1.0.19
 	 */
 	public function saved_payment_methods() {
-		$html = '<ul class="getpaid-saved-payment-methods list-unstyled m-0 mt-2" data-count="' . esc_attr( count( $this->get_tokens( $this->is_sandbox() ) ) ) . '">';
+		$html = '<ul class="getpaid-saved-payment-methods list-unstyled m-0 mt-2" data-count="' . esc_attr(count($this->get_tokens($this->is_sandbox()))) . '">';
 
-		foreach ( $this->get_tokens( $this->is_sandbox() ) as $token ) {
-			$html .= $this->get_saved_payment_method_option_html( $token );
+		foreach ($this->get_tokens($this->is_sandbox()) as $token) {
+			$html .= $this->get_saved_payment_method_option_html($token);
 		}
 
 		$html .= $this->get_new_payment_method_option_html();
 		$html .= '</ul>';
 
-		echo apply_filters( 'getpaid_payment_gateway_form_saved_payment_methods_html', $html, $this );
+		echo apply_filters('getpaid_payment_gateway_form_saved_payment_methods_html', $html, $this);
 	}
 
 	/**
@@ -627,7 +627,7 @@ 
 	 * @param  array $token Payment Token.
 	 * @return string Generated payment method HTML
 	 */
-	public function get_saved_payment_method_option_html( $token ) {
+	public function get_saved_payment_method_option_html($token) {
 
 		return sprintf(
 			'<li class="getpaid-payment-method form-group">
@@ -636,11 +636,11 @@ 
 					<span>%3$s</span>
 				</label>
 			</li>',
-			esc_attr( $this->id ),
-			esc_attr( $token['id'] ),
-			esc_html( $token['name'] ),
-			checked( empty( $token['default'] ), false, false ),
-			empty( $token['currency'] ) ? 'none' : esc_attr( $token['currency'] )
+			esc_attr($this->id),
+			esc_attr($token['id']),
+			esc_html($token['name']),
+			checked(empty($token['default']), false, false),
+			empty($token['currency']) ? 'none' : esc_attr($token['currency'])
 		);
 
 	}
@@ -652,7 +652,7 @@ 
 	 */
 	public function get_new_payment_method_option_html() {
 
-		$label = apply_filters( 'getpaid_new_payment_method_label', $this->new_method_label ? $this->new_method_label : __( 'Use a new payment method', 'invoicing' ), $this );
+		$label = apply_filters('getpaid_new_payment_method_label', $this->new_method_label ? $this->new_method_label : __('Use a new payment method', 'invoicing'), $this);
 
 		return sprintf(
 			'<li class="getpaid-new-payment-method">
@@ -661,8 +661,8 @@ 
 					<span>%2$s</span>
 				</label>
 			</li>',
-			esc_attr( $this->id ),
-			esc_html( $label )
+			esc_attr($this->id),
+			esc_html($label)
 		);
 
 	}
@@ -677,10 +677,10 @@ 
 		return aui()->input(
 			array(
 				'type'       => 'checkbox',
-				'name'       => esc_attr( "getpaid-$this->id-new-payment-method" ),
-				'id'         => esc_attr( uniqid( $this->id ) ),
+				'name'       => esc_attr("getpaid-$this->id-new-payment-method"),
+				'id'         => esc_attr(uniqid($this->id)),
 				'required'   => false,
-				'label'      => esc_html__( 'Save payment method', 'invoicing' ),
+				'label'      => esc_html__('Save payment method', 'invoicing'),
 				'value'      => 'true',
 				'checked'    => true,
 				'wrap_class' => 'getpaid-save-payment-method pt-1 pb-1',
@@ -694,9 +694,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function register_gateway( $gateways ) {
+	public function register_gateway($gateways) {
 
-		$gateways[ $this->id ] = array(
+		$gateways[$this->id] = array(
 
 			'admin_label'    => $this->method_title,
             'checkout_label' => $this->title,
@@ -714,13 +714,13 @@ 
 	 * @param  WPInv_Invoice|null $invoice Invoice object or null.
 	 * @return bool
 	 */
-	public function is_sandbox( $invoice = null ) {
+	public function is_sandbox($invoice = null) {
 
-		if ( ! empty( $invoice ) && ! $invoice->needs_payment() ) {
+		if (!empty($invoice) && !$invoice->needs_payment()) {
 			return $invoice->get_mode() == 'test';
 		}
 
-		return wpinv_is_test_mode( $this->id );
+		return wpinv_is_test_mode($this->id);
 
 	}
 
@@ -738,15 +738,15 @@ 
 	 *
 	 * @return bool
 	 */
-	public function validate_currency( $validation, $currency ) {
+	public function validate_currency($validation, $currency) {
 
 		// Required currencies.
-		if ( ! empty( $this->currencies ) && ! in_array( $currency, $this->currencies ) ) {
+		if (!empty($this->currencies) && !in_array($currency, $this->currencies)) {
 			return false;
 		}
 
 		// Excluded currencies.
-		if ( ! empty( $this->exclude_currencies ) && in_array( $currency, $this->exclude_currencies ) ) {
+		if (!empty($this->exclude_currencies) && in_array($currency, $this->exclude_currencies)) {
 			return false;
 		}
 
@@ -757,13 +757,13 @@ 
 	 * Displays an error
 	 *
 	 */
-	public function show_error( $code, $message, $type ) {
+	public function show_error($code, $message, $type) {
 
-		if ( is_admin() ) {
-			getpaid_admin()->{"show_$type"}( $message );
+		if (is_admin()) {
+			getpaid_admin()->{"show_$type"}($message);
 		}
 
-		wpinv_set_error( $code, $message, $type );
+		wpinv_set_error($code, $message, $type);
 
 	}
 

templates/payment-forms/variations/checkbox.php

Spacing +8 added lines, -8 removed lines

@@ -7,31 +7,31 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the selectable items.
 $selectable = array();
-foreach ( $form->get_items() as $item ) {
-    if ( ! $item->is_required ) {
-        $selectable[$item->get_id()] = $item->get_name() . ' — ' . wpinv_price( $item->get_initial_price() );
+foreach ($form->get_items() as $item) {
+    if (!$item->is_required) {
+        $selectable[$item->get_id()] = $item->get_name() . ' — ' . wpinv_price($item->get_initial_price());
     }
 }
 
-if ( empty( $selectable ) ) {
+if (empty($selectable)) {
     return;
 }
 
 echo '<div class="getpaid-payment-form-items-checkbox form-group">';
 
-foreach ( $selectable as $item_id => $item_name ) {
+foreach ($selectable as $item_id => $item_name) {
 
-    $is_checked = get_post_meta( $item_id, 'selected_by_default', true );
+    $is_checked = get_post_meta($item_id, 'selected_by_default', true);
 
     echo aui()->input(
         array(
             'type'       => 'checkbox',
             'name'       => 'getpaid-payment-form-selected-item',
-            'id'         => 'getpaid-payment-form-selected-item' . uniqid( '_' ) . $item_id,
+            'id'         => 'getpaid-payment-form-selected-item' . uniqid('_') . $item_id,
             'label'      => $item_name,
             'value'      => $item_id,
             'no_wrap'    => true,

templates/payment-forms/form.php

Spacing +24 added lines, -24 removed lines

@@ -7,26 +7,26 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Make sure that the form is active.
-if ( ! $form->is_active() ) {
+if (!$form->is_active()) {
     echo aui()->alert(
         array(
             'type'    => 'warning',
-            'content' => __( 'This payment form is no longer active', 'invoicing' ),
+            'content' => __('This payment form is no longer active', 'invoicing'),
         )
     );
     return;
 }
 
 // Require login to checkout.
-if ( wpinv_require_login_to_checkout() && ! get_current_user_id() ) {
+if (wpinv_require_login_to_checkout() && !get_current_user_id()) {
 
     echo aui()->alert(
         array(
             'type'    => 'danger',
-            'content' => __( 'You must be logged in to checkout.', 'invoicing' ),
+            'content' => __('You must be logged in to checkout.', 'invoicing'),
         )
     );
     return;
@@ -34,29 +34,29 @@ 
 }
 
 // Fires before displaying a payment form.
-do_action( 'getpaid_before_payment_form', $form );
+do_action('getpaid_before_payment_form', $form);
 ?>
 
-<form class='getpaid-payment-form getpaid-payment-form-<?php echo absint( $form->get_id() ); ?> bsui position-relative' method='POST' data-key='<?php echo uniqid('gpf'); ?>' data-currency='<?php echo esc_attr( empty( $form->invoice ) ? wpinv_get_currency() : $form->invoice->get_currency() ); ?>' novalidate>
+<form class='getpaid-payment-form getpaid-payment-form-<?php echo absint($form->get_id()); ?> bsui position-relative' method='POST' data-key='<?php echo uniqid('gpf'); ?>' data-currency='<?php echo esc_attr(empty($form->invoice) ? wpinv_get_currency() : $form->invoice->get_currency()); ?>' novalidate>
 
     <?php
     
         // Fires when printing the top of a payment form.
-        do_action( 'getpaid_payment_form_top', $form );
+        do_action('getpaid_payment_form_top', $form);
 
         // And the optional invoice id.
-        if ( ! empty( $form->invoice ) ) {
-            echo getpaid_hidden_field( 'invoice_id', $form->invoice->get_id() );
+        if (!empty($form->invoice)) {
+            echo getpaid_hidden_field('invoice_id', $form->invoice->get_id());
         }
 
         // We also want to include the form id.
-        echo getpaid_hidden_field( 'form_id', $form->get_id() );
+        echo getpaid_hidden_field('form_id', $form->get_id());
 
         // And an indication that this is a payment form submission.
-        echo getpaid_hidden_field( 'getpaid_payment_form_submission', '1' );
+        echo getpaid_hidden_field('getpaid_payment_form_submission', '1');
 
         // Fires before displaying payment form elements.
-        do_action( 'getpaid_payment_form_before_elements', $form );
+        do_action('getpaid_payment_form_before_elements', $form);
 
         // Display the elements.
         ?>
@@ -64,13 +64,13 @@ 
             <div class="row">
                 <?php
 
-                    foreach ( $form->get_elements() as $element ) {
+                    foreach ($form->get_elements() as $element) {
 
-                        if ( isset( $element['type'] ) ) {
-                            $grid_class = esc_attr( getpaid_get_form_element_grid_class( $element ) );
+                        if (isset($element['type'])) {
+                            $grid_class = esc_attr(getpaid_get_form_element_grid_class($element));
                             echo "<div class='$grid_class'>";
-                            do_action( 'getpaid_payment_form_element', $element, $form );
-                            do_action( "getpaid_payment_form_element_{$element['type']}_template", $element, $form );
+                            do_action('getpaid_payment_form_element', $element, $form);
+                            do_action("getpaid_payment_form_element_{$element['type']}_template", $element, $form);
                             echo "</div>";
                         }
 
@@ -82,16 +82,16 @@ 
 
         <?php
         // Fires after displaying payment form elements.
-        do_action( 'getpaid_payment_form_after_elements', $form );
+        do_action('getpaid_payment_form_after_elements', $form);
 
         echo "<div class='getpaid-payment-form-errors alert alert-danger d-none'></div>";
 
-        if ( wpinv_current_user_can_manage_invoicing() ) {
+        if (wpinv_current_user_can_manage_invoicing()) {
 
             edit_post_link(
-                __( 'Edit this form.', 'invoicing' ),
+                __('Edit this form.', 'invoicing'),
                 '<small class="form-text text-muted">',
-                '&nbsp;' . __( 'This is only visible to website administators.', 'invoicing' ) . '</small>',
+                '&nbsp;' . __('This is only visible to website administators.', 'invoicing') . '</small>',
                 $form->get_id(),
                 'text-danger'
             );
@@ -103,7 +103,7 @@ 
 
     <div class="loading_div overlay overlay-black position-absolute row m-0 rounded overflow-hidden" style="height: 100%;width: 100%;top: 0px;z-index: 2;display:none;">
         <div class="spinner-border mx-auto align-self-center text-white" role="status">
-            <span class="sr-only"><?php _e( 'Loading...', 'invoicing' );?></span>
+            <span class="sr-only"><?php _e('Loading...', 'invoicing'); ?></span>
         </div>
     </div>
 
@@ -112,4 +112,4 @@ 
 <?php
 
 // Fires after displaying a payment form.
-do_action( 'getpaid_after_payment_form', $form );
+do_action('getpaid_after_payment_form', $form);