AyeCode / invoicing

includes/wpinv-address-functions.php

Indentation +87 added lines, -87 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 /**
@@ -36,7 +36,7 @@ 
  */
 function wpinv_sanitize_country( $country ) {
 
-	// Enure the country is specified
+    // Enure the country is specified
     if ( empty( $country ) ) {
         $country = wpinv_get_default_country();
     }
@@ -66,9 +66,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+    $state = wpinv_get_option( 'default_state', '' );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -299,11 +299,11 @@ 
 
     $country = wpinv_sanitize_country( $country );
 
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
-			return $continent_code;
-		}
-	}
+    foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
+        if ( false !== array_search( $country, $countries, true ) ) {
+            return $continent_code;
+        }
+    }
 
     return '';
 
@@ -595,31 +595,31 @@ 
 }
 
 function wpinv_get_states_field() {
-	if ( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if ( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if ( ! empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if ( ! empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
 
         $class  = isset( $_POST['class'] ) ? esc_attr( sanitize_text_field( $_POST['class'] ) ) : '';
         $class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
 
         $args  = array(
-			'name'             => $sanitized_field_name,
-			'id'               => $sanitized_field_name,
-			'class'            => implode( ' ', array_unique( explode( ' ', $class ) ) ),
-			'options'          => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false,
-		);
-
-		wpinv_html_select( $args );
-
-	} else {
-		echo 'nostates';
-	}
+            'name'             => $sanitized_field_name,
+            'id'               => $sanitized_field_name,
+            'class'            => implode( ' ', array_unique( explode( ' ', $class ) ) ),
+            'options'          => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false,
+        );
+
+        wpinv_html_select( $args );
+
+    } else {
+        echo 'nostates';
+    }
 
 }
 
@@ -638,47 +638,47 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters(
+        return apply_filters(
             'wpinv_localisation_address_formats',
-			array(
-				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
-				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
-				'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
-				'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
-				'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
-				'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
-				'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
-				'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
-				'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
-				'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
-				'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
-				'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
-				'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
-				'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
-				'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
-				'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
-				'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
-				'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
-			)
-		);
+            array(
+                'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
+                'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
+                'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
+                'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
+                'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
+                'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
+                'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
+                'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
+                'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
+                'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
+                'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
+                'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
+                'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
+                'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
+                'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
+                'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
+                'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
+                'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
+            )
+        );
 }
 
 /**
@@ -695,21 +695,21 @@ 
     }
 
     // Get all formats.
-	$formats = wpinv_get_address_formats();
+    $formats = wpinv_get_address_formats();
 
-	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+    // Get format for the specified country.
+    $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
 
     /**
-	 * Filters the address format to use on Invoices.
+     * Filters the address format to use on Invoices.
      *
      * New lines will be replaced by a `br` element. Double new lines will be replaced by a paragraph. HTML tags are allowed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $format  The address format to use.
+     *
+     * @since 1.0.13
+     *
+     * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
-	 */
+     */
     return apply_filters( 'wpinv_get_full_address_format', $format, $country );
 }
 
@@ -730,8 +730,8 @@ 
         'country'    => '',
         'zip'        => '',
         'first_name' => '',
-		'last_name'  => '',
-		'company'    => '',
+        'last_name'  => '',
+        'company'    => '',
     );
 
     $args    = map_deep( wp_parse_args( array_filter( $billing_details ), $default_args ), 'trim' );
@@ -752,14 +752,14 @@ 
     $args['country_code'] = $country;
 
     /**
-	 * Filters the address format replacements to use on Invoices.
+     * Filters the address format replacements to use on Invoices.
+     *
+     *
+     * @since 1.0.13
      *
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param array $replacements  The address replacements to use.
+     * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
-	 */
+     */
     $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
 
     $return = array();
@@ -782,5 +782,5 @@ 
  * @return string
  */
 function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+    return trim( $line, ', ' );
 }

includes/class-getpaid-invoice-notification-emails.php

Indentation +470 added lines, -470 removed lines

@@ -12,493 +12,493 @@
  */
 class GetPaid_Invoice_Notification_Emails {
 
-	/**
-	 * The array of invoice email actions.
-	 *
-	 * @param array
-	 */
-	public $invoice_actions;
-
-	/**
-	 * Class constructor
-	 *
-	 */
-	public function __construct() {
-
-		$this->invoice_actions = apply_filters(
-			'getpaid_notification_email_invoice_triggers',
-			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
-				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
-				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
-				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
-				'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
-				'getpaid_invoice_status_publish'        => 'completed_invoice',
-				'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
-				'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
-				'getpaid_new_customer_note'             => 'user_note',
-				'getpaid_daily_maintenance'             => 'overdue',
-			)
-		);
-
-		$this->init_hooks();
-
-	}
-
-	/**
-	 * Registers email hooks.
-	 */
-	public function init_hooks() {
-
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
-
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
-		}
-	}
-
-	/**
-	 * Registers an email hook for an invoice action.
-	 *
-	 * @param string $hook
-	 * @param string|array $email_type
-	 */
-	public function init_email_type_hook( $hook, $email_type ) {
-
-		$email_type = wpinv_parse_list( $email_type );
-
-		foreach ( $email_type as $type ) {
-
-			$email = new GetPaid_Notification_Email( $type );
-
-			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
-				continue;
-			}
-
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
-				continue;
-			}
-
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
-		}
-
-	}
-
-	/**
-	 * Filters invoice merge tags.
-	 *
-	 * @param array $merge_tags
-	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
-	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
-
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
-			);
-		}
-
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
-			);
-		}
-
-		return $merge_tags;
-
-	}
-
-	/**
-	 * Generates invoice merge tags.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return array
-	 */
-	public function get_invoice_merge_tags( $invoice ) {
-
-		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
-			return array();
-		}
-
-		$due_date   = $invoice->get_due_date();
-		$due_date   = empty( $due_date ) ? time() + MINUTE_IN_SECONDS : strtotime( $due_date ) + ( (int) get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
-		$merge_tags = array(
-			'{name}'                 => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'            => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'           => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'            => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'                => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'       => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'     => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'        => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'         => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'     => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}' => esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'         => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'     => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'        => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'        => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}'  => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'    => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'               => $due_date < time() ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
-		);
-
-		$payment_form_data = $invoice->get_meta( 'payment_form_data', true );
-
-		if ( is_array( $payment_form_data ) ) {
-
-			foreach ( $payment_form_data as $label => $value ) {
-
-				$label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
-				$value = is_array( $value ) ? implode( ', ', $value ) : $value;
-
-				if ( is_scalar( $value ) ) {
-					$merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
-				}
-			}
-		}
-
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
-	}
-
-	/**
-	 * Helper function to send an email.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Notification_Email $email
-	 * @param string $type
-	 * @param string|array $recipients
-	 * @param array $extra_args Extra template args.
-	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
-
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
-
-		$skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
-		if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
-			return;
-		}
-
-		$mailer     = new GetPaid_Notification_Email_Sender();
-		$merge_tags = $email->get_merge_tags();
-
-		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
-			$email->get_attachments()
-		);
-
-		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
-			$mailer->send(
-				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
-				$email->get_attachments()
-			);
-		}
-
-		if ( $result ) {
-			$invoice->add_system_note(
-				sprintf(
-					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
-				)
-			);
-		} else {
-			$invoice->add_system_note(
-				sprintf(
-					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
-				)
-			);
-		}
-
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
-
-		return $result;
-	}
-
-	/**
-	 * Also send emails to any cc users.
-	 *
-	 * @param array $recipients
-	 * @param GetPaid_Notification_Email $email
-	 */
-	public function filter_email_recipients( $recipients, $email ) {
-
-		if ( ! $email->is_admin_email() ) {
-			$cc   = $email->object->get_email_cc();
-			$cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
-
-			if ( ! empty( $cc ) ) {
-				$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
-			}
-
-			if ( ! empty( $cc_2 ) ) {
-				$cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
-			}
-		}
-
-		return $recipients;
-
-	}
-
-	/**
-	 * Sends a new invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function new_invoice( $invoice ) {
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a cancelled invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function cancelled_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-	}
-
-	/**
-	 * Sends a failed invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function failed_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is put on hold.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function onhold_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is marked as processing payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function processing_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is paid.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function completed_invoice( $invoice ) {
-
-		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
+    /**
+     * The array of invoice email actions.
+     *
+     * @param array
+     */
+    public $invoice_actions;
+
+    /**
+     * Class constructor
+     *
+     */
+    public function __construct() {
+
+        $this->invoice_actions = apply_filters(
+            'getpaid_notification_email_invoice_triggers',
+            array(
+                'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+                'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
+                'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
+                'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
+                'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
+                'getpaid_invoice_status_publish'        => 'completed_invoice',
+                'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
+                'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
+                'getpaid_new_customer_note'             => 'user_note',
+                'getpaid_daily_maintenance'             => 'overdue',
+            )
+        );
+
+        $this->init_hooks();
+
+    }
+
+    /**
+     * Registers email hooks.
+     */
+    public function init_hooks() {
+
+        add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
+        add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+
+        foreach ( $this->invoice_actions as $hook => $email_type ) {
+            $this->init_email_type_hook( $hook, $email_type );
+        }
+    }
+
+    /**
+     * Registers an email hook for an invoice action.
+     *
+     * @param string $hook
+     * @param string|array $email_type
+     */
+    public function init_email_type_hook( $hook, $email_type ) {
+
+        $email_type = wpinv_parse_list( $email_type );
+
+        foreach ( $email_type as $type ) {
+
+            $email = new GetPaid_Notification_Email( $type );
+
+            // Abort if it is not active.
+            if ( ! $email->is_active() ) {
+                continue;
+            }
+
+            if ( method_exists( $this, $type ) ) {
+                add_action( $hook, array( $this, $type ), 100, 2 );
+                continue;
+            }
+
+            do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+        }
+
+    }
+
+    /**
+     * Filters invoice merge tags.
+     *
+     * @param array $merge_tags
+     * @param mixed|WPInv_Invoice|WPInv_Subscription $object
+     */
+    public function invoice_merge_tags( $merge_tags, $object ) {
+
+        if ( is_a( $object, 'WPInv_Invoice' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object )
+            );
+        }
+
+        if ( is_a( $object, 'WPInv_Subscription' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object->get_parent_payment() )
+            );
+        }
+
+        return $merge_tags;
+
+    }
+
+    /**
+     * Generates invoice merge tags.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return array
+     */
+    public function get_invoice_merge_tags( $invoice ) {
+
+        // Abort if it does not exist.
+        if ( ! $invoice->get_id() ) {
+            return array();
+        }
+
+        $due_date   = $invoice->get_due_date();
+        $due_date   = empty( $due_date ) ? time() + MINUTE_IN_SECONDS : strtotime( $due_date ) + ( (int) get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+        $merge_tags = array(
+            '{name}'                 => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{full_name}'            => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{first_name}'           => sanitize_text_field( $invoice->get_first_name() ),
+            '{last_name}'            => sanitize_text_field( $invoice->get_last_name() ),
+            '{email}'                => sanitize_email( $invoice->get_email() ),
+            '{invoice_number}'       => sanitize_text_field( $invoice->get_number() ),
+            '{invoice_currency}'     => sanitize_text_field( $invoice->get_currency() ),
+            '{invoice_total}'        => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
+            '{invoice_link}'         => esc_url( $invoice->get_view_url() ),
+            '{invoice_pay_link}'     => esc_url( $invoice->get_checkout_payment_url() ),
+            '{invoice_receipt_link}' => esc_url( $invoice->get_receipt_url() ),
+            '{invoice_date}'         => getpaid_format_date_value( $invoice->get_date_created() ),
+            '{invoice_due_date}'     => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
+            '{invoice_quote}'        => sanitize_text_field( strtolower( $invoice->get_label() ) ),
+            '{invoice_label}'        => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
+            '{invoice_description}'  => wp_kses_post( $invoice->get_description() ),
+            '{subscription_name}'    => wp_kses_post( $invoice->get_subscription_name() ),
+            '{is_was}'               => $due_date < time() ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+        );
+
+        $payment_form_data = $invoice->get_meta( 'payment_form_data', true );
+
+        if ( is_array( $payment_form_data ) ) {
+
+            foreach ( $payment_form_data as $label => $value ) {
+
+                $label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
+                $value = is_array( $value ) ? implode( ', ', $value ) : $value;
+
+                if ( is_scalar( $value ) ) {
+                    $merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
+                }
+            }
+        }
+
+        return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+    }
 
-	/**
-	 * Sends a notification whenever an invoice is refunded.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function refunded_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
+    /**
+     * Helper function to send an email.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Notification_Email $email
+     * @param string $type
+     * @param string|array $recipients
+     * @param array $extra_args Extra template args.
+     */
+    public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
 
-	/**
-	 * Notifies a user about new invoices
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param bool $force
-	 */
-	public function user_invoice( $invoice, $force = false ) {
+        do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
 
-		if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
-			return;
-		}
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Checks if an invoice is a payment form invoice.
-	 *
-	 * @param int $invoice
-	 * @return bool
-	 */
-	public function is_payment_form_invoice( $invoice ) {
-		$created_via             = get_post_meta( $invoice, 'wpinv_created_via', true );
-		$is_payment_form_invoice = 'payment_form' === $created_via || 'geodirectory' === $created_via;
-		$is_payment_form_invoice = apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
-		return empty( $_GET['getpaid-admin-action'] ) && $is_payment_form_invoice;
-	}
-
-	/**
-	 * Notifies admin about new invoice notes
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $note
-	 */
-	public function user_note( $invoice, $note ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
-
-	}
-
-	/**
-	 * (Force) Sends overdue notices.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
-	}
-
-	/**
-	 * Sends overdue notices.
-	 *
-	 * @TODO: Create an invoices query class.
-	 */
-	public function overdue() {
-		global $wpdb;
-
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
-
-		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
-
-		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
-			return;
-		}
-
-		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
-
-		// Invoices table.
-		$table = $wpdb->prefix . 'getpaid_invoices';
-
-		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
-			"SELECT posts.ID FROM $wpdb->posts as posts
+        $skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
+        if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
+            return;
+        }
+
+        $mailer     = new GetPaid_Notification_Email_Sender();
+        $merge_tags = $email->get_merge_tags();
+
+        $result = $mailer->send(
+            apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
+            $email->add_merge_tags( $email->get_subject(), $merge_tags ),
+            $email->get_content( $merge_tags, $extra_args ),
+            $email->get_attachments()
+        );
+
+        // Maybe send a copy to the admin.
+        if ( $email->include_admin_bcc() ) {
+            $mailer->send(
+                wpinv_get_admin_email(),
+                $email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
+                $email->get_content( $merge_tags ),
+                $email->get_attachments()
+            );
+        }
+
+        if ( $result ) {
+            $invoice->add_system_note(
+                sprintf(
+                    // translators: %1 is the email type, %2 is the invoice recipient.
+                    __( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+                )
+            );
+        } else {
+            $invoice->add_system_note(
+                sprintf(
+                    // translators: %1 is the email type, %2 is the invoice recipient.
+                    __( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+                )
+            );
+        }
+
+        do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+
+        return $result;
+    }
+
+    /**
+     * Also send emails to any cc users.
+     *
+     * @param array $recipients
+     * @param GetPaid_Notification_Email $email
+     */
+    public function filter_email_recipients( $recipients, $email ) {
+
+        if ( ! $email->is_admin_email() ) {
+            $cc   = $email->object->get_email_cc();
+            $cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
+
+            if ( ! empty( $cc ) ) {
+                $cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+            }
+
+            if ( ! empty( $cc_2 ) ) {
+                $cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
+            }
+        }
+
+        return $recipients;
+
+    }
+
+    /**
+     * Sends a new invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function new_invoice( $invoice ) {
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a cancelled invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function cancelled_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+    }
+
+    /**
+     * Sends a failed invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function failed_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is put on hold.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function onhold_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is marked as processing payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function processing_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is paid.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function completed_invoice( $invoice ) {
+
+        // (Maybe) abort if it is a renewal invoice.
+        if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is refunded.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function refunded_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Notifies a user about new invoices
+     *
+     * @param WPInv_Invoice $invoice
+     * @param bool $force
+     */
+    public function user_invoice( $invoice, $force = false ) {
+
+        if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+            return;
+        }
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Checks if an invoice is a payment form invoice.
+     *
+     * @param int $invoice
+     * @return bool
+     */
+    public function is_payment_form_invoice( $invoice ) {
+        $created_via             = get_post_meta( $invoice, 'wpinv_created_via', true );
+        $is_payment_form_invoice = 'payment_form' === $created_via || 'geodirectory' === $created_via;
+        $is_payment_form_invoice = apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
+        return empty( $_GET['getpaid-admin-action'] ) && $is_payment_form_invoice;
+    }
+
+    /**
+     * Notifies admin about new invoice notes
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $note
+     */
+    public function user_note( $invoice, $note ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+
+    }
+
+    /**
+     * (Force) Sends overdue notices.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function force_send_overdue_notice( $invoice ) {
+        $email = new GetPaid_Notification_Email( 'overdue', $invoice );
+        return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+    }
+
+    /**
+     * Sends overdue notices.
+     *
+     * @TODO: Create an invoices query class.
+     */
+    public function overdue() {
+        global $wpdb;
+
+        $email = new GetPaid_Notification_Email( __FUNCTION__ );
+
+        // Fetch reminder days.
+        $reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+
+        // Abort if non is set.
+        if ( empty( $reminder_days ) ) {
+            return;
+        }
+
+        // Retrieve date query.
+        $date_query = $this->get_date_query( $reminder_days );
+
+        // Invoices table.
+        $table = $wpdb->prefix . 'getpaid_invoices';
+
+        // Fetch invoices.
+        $invoices  = $wpdb->get_col(
+            "SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query"
         );
 
-		foreach ( $invoices as $invoice ) {
+        foreach ( $invoices as $invoice ) {
 
-			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
-				$email->object = $invoice;
+            // Only send this email for invoices created via the admin page.
+            if ( ! $this->is_payment_form_invoice( $invoice ) ) {
+                $invoice       = new WPInv_Invoice( $invoice );
+                $email->object = $invoice;
 
-				if ( $invoice->needs_payment() && ! $invoice->is_renewal() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
-				}
-			}
-		}
+                if ( $invoice->needs_payment() && ! $invoice->is_renewal() ) {
+                    $this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+                }
+            }
+        }
 
-	}
+    }
 
-	/**
-	 * Calculates the date query for an invoices query
-	 *
-	 * @param array $reminder_days
-	 * @return string
-	 */
-	public function get_date_query( $reminder_days ) {
+    /**
+     * Calculates the date query for an invoices query
+     *
+     * @param array $reminder_days
+     * @return string
+     */
+    public function get_date_query( $reminder_days ) {
 
-		$date_query = array(
-			'relation' => 'OR',
-		);
+        $date_query = array(
+            'relation' => 'OR',
+        );
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
+        foreach ( $reminder_days as $days ) {
+            $date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
 
-			$date_query[] = array(
-				'year'  => $date['year'],
-				'month' => $date['month'],
-				'day'   => $date['day'],
-			);
+            $date_query[] = array(
+                'year'  => $date['year'],
+                'month' => $date['month'],
+                'day'   => $date['day'],
+            );
 
-		}
+        }
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+        $date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
 
-		return $date_query->get_sql();
+        return $date_query->get_sql();
 
-	}
+    }
 
 }

includes/data-stores/class-getpaid-item-data-store.php

Indentation +210 added lines, -210 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -14,228 +14,228 @@ 
  */
 class GetPaid_Item_Data_Store extends GetPaid_Data_Store_WP {
 
-	/**
-	 * Data stored in meta keys, but not considered "meta" for an item.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $internal_meta_keys = array(
-		'_wpinv_price',
-		'_wpinv_vat_rule',
-		'_wpinv_vat_class',
-		'_wpinv_type',
-		'_wpinv_custom_id',
-		'_wpinv_custom_name',
-		'_wpinv_custom_singular_name',
-		'_wpinv_editable',
-		'_wpinv_dynamic_pricing',
-		'_minimum_price',
-		'_wpinv_is_recurring',
-		'_wpinv_recurring_period',
-		'_wpinv_recurring_interval',
-		'_wpinv_recurring_limit',
-		'_wpinv_free_trial',
-		'_wpinv_trial_period',
-		'_wpinv_trial_interval',
-	);
-
-	/**
-	 * A map of meta keys to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $meta_key_to_props = array(
-		'_wpinv_price'                => 'price',
-		'_wpinv_vat_rule'             => 'vat_rule',
-		'_wpinv_vat_class'            => 'vat_class',
-		'_wpinv_type'                 => 'type',
-		'_wpinv_custom_id'            => 'custom_id',
-		'_wpinv_custom_name'          => 'custom_name',
-		'_wpinv_custom_singular_name' => 'custom_singular_name',
-		'_wpinv_editable'             => 'is_editable',
-		'_wpinv_dynamic_pricing'      => 'is_dynamic_pricing',
-		'_minimum_price'              => 'minimum_price',
-		'_wpinv_custom_name'          => 'custom_name',
-		'_wpinv_is_recurring'         => 'is_recurring',
-		'_wpinv_recurring_period'     => 'recurring_period',
-		'_wpinv_recurring_interval'   => 'recurring_interval',
-		'_wpinv_recurring_limit'      => 'recurring_limit',
-		'_wpinv_free_trial'           => 'is_free_trial',
-		'_wpinv_trial_period'         => 'trial_period',
-		'_wpinv_trial_interval'       => 'trial_interval',
-		'_wpinv_version'              => 'version',
-	);
-
-	/*
+    /**
+     * Data stored in meta keys, but not considered "meta" for an item.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $internal_meta_keys = array(
+        '_wpinv_price',
+        '_wpinv_vat_rule',
+        '_wpinv_vat_class',
+        '_wpinv_type',
+        '_wpinv_custom_id',
+        '_wpinv_custom_name',
+        '_wpinv_custom_singular_name',
+        '_wpinv_editable',
+        '_wpinv_dynamic_pricing',
+        '_minimum_price',
+        '_wpinv_is_recurring',
+        '_wpinv_recurring_period',
+        '_wpinv_recurring_interval',
+        '_wpinv_recurring_limit',
+        '_wpinv_free_trial',
+        '_wpinv_trial_period',
+        '_wpinv_trial_interval',
+    );
+
+    /**
+     * A map of meta keys to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $meta_key_to_props = array(
+        '_wpinv_price'                => 'price',
+        '_wpinv_vat_rule'             => 'vat_rule',
+        '_wpinv_vat_class'            => 'vat_class',
+        '_wpinv_type'                 => 'type',
+        '_wpinv_custom_id'            => 'custom_id',
+        '_wpinv_custom_name'          => 'custom_name',
+        '_wpinv_custom_singular_name' => 'custom_singular_name',
+        '_wpinv_editable'             => 'is_editable',
+        '_wpinv_dynamic_pricing'      => 'is_dynamic_pricing',
+        '_minimum_price'              => 'minimum_price',
+        '_wpinv_custom_name'          => 'custom_name',
+        '_wpinv_is_recurring'         => 'is_recurring',
+        '_wpinv_recurring_period'     => 'recurring_period',
+        '_wpinv_recurring_interval'   => 'recurring_interval',
+        '_wpinv_recurring_limit'      => 'recurring_limit',
+        '_wpinv_free_trial'           => 'is_free_trial',
+        '_wpinv_trial_period'         => 'trial_period',
+        '_wpinv_trial_interval'       => 'trial_interval',
+        '_wpinv_version'              => 'version',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new item in the database.
-	 *
-	 * @param WPInv_Item $item Item object.
-	 */
-	public function create( &$item ) {
-		$item->set_version( WPINV_VERSION );
-		$item->set_date_created( current_time( 'mysql' ) );
-
-		// Create a new post.
-		$id = wp_insert_post(
-			apply_filters(
-				'getpaid_new_item_data',
-				array(
-					'post_date'    => $item->get_date_created( 'edit' ),
-					'post_type'    => 'wpi_item',
-					'post_status'  => $this->get_post_status( $item ),
-					'ping_status'  => 'closed',
-					'post_author'  => $item->get_author( 'edit' ),
-					'post_title'   => $item->get_name( 'edit' ),
-					'post_parent'  => $item->get_parent_id(),
-					'post_excerpt' => $item->get_description( 'edit' ),
-				)
-			),
-			true
-		);
-
-		if ( $id && ! is_wp_error( $id ) ) {
-			$item->set_id( $id );
-			$this->update_post_meta( $item );
-			$item->save_meta_data();
-			$item->apply_changes();
-			$this->clear_caches( $item );
-			do_action( 'getpaid_new_item', $item );
-			return true;
-		}
-
-		if ( is_wp_error( $id ) ) {
-			$item->last_error = $id->get_error_message();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read an item from the database.
-	 *
-	 * @param WPInv_Item $item Item object.
-	 *
-	 */
-	public function read( &$item ) {
-
-		$item->set_defaults();
-		$item_object = get_post( $item->get_id() );
-
-		if ( ! $item->get_id() || ! $item_object || $item_object->post_type != 'wpi_item' ) {
-			$item->last_error = __( 'Invalid item.', 'invoicing' );
-			$item->set_id( 0 );
-			return false;
-		}
-
-		$item->set_props(
-			array(
-				'parent_id'     => $item_object->post_parent,
-				'date_created'  => 0 < $item_object->post_date ? $item_object->post_date : null,
-				'date_modified' => 0 < $item_object->post_modified ? $item_object->post_modified : null,
-				'status'        => $item_object->post_status,
-				'name'          => $item_object->post_title,
-				'description'   => $item_object->post_excerpt,
-				'author'        => $item_object->post_author,
-			)
-		);
-
-		$this->read_object_data( $item, $item_object );
-		$item->read_meta_data();
-		$item->set_object_read( true );
-		do_action( 'getpaid_read_item', $item );
-
-	}
-
-	/**
-	 * Method to update an item in the database.
-	 *
-	 * @param WPInv_Item $item Item object.
-	 */
-	public function update( &$item ) {
-		$item->save_meta_data();
-		$item->set_version( WPINV_VERSION );
-
-		if ( null === $item->get_date_created( 'edit' ) ) {
-			$item->set_date_created( current_time( 'mysql' ) );
-		}
-
-		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $item->get_id() );
-
-		$changes = $item->get_changes();
-
-		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author' ), array_keys( $changes ) ) ) {
-			$post_data = array(
-				'post_date'     => $item->get_date_created( 'edit' ),
-				'post_status'   => $item->get_status( 'edit' ),
-				'post_parent'   => $item->get_parent_id( 'edit' ),
-				'post_excerpt'  => $item->get_description( 'edit' ),
-				'post_modified' => $item->get_date_modified( 'edit' ),
-				'post_title'    => $item->get_name( 'edit' ),
-				'post_author'   => $item->get_author( 'edit' ),
-			);
-
-			/**
-			 * When updating this object, to prevent infinite loops, use $wpdb
-			 * to update data, since wp_update_post spawns more calls to the
-			 * save_post action.
-			 *
-			 * This ensures hooks are fired by either WP itself (admin screen save),
-			 * or an update purely from CRUD.
-			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $item->get_id() ) );
-				clean_post_cache( $item->get_id() );
-			} else {
-				wp_update_post( array_merge( array( 'ID' => $item->get_id() ), $post_data ) );
-			}
-			$item->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
-		}
-		$this->update_post_meta( $item );
-		$item->apply_changes();
-		$this->clear_caches( $item );
-
-		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $item->get_status( 'edit' );
-
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_item', $item );
-		} else {
-			do_action( 'getpaid_update_item', $item );
-		}
-
-	}
-
-	/*
+    /**
+     * Method to create a new item in the database.
+     *
+     * @param WPInv_Item $item Item object.
+     */
+    public function create( &$item ) {
+        $item->set_version( WPINV_VERSION );
+        $item->set_date_created( current_time( 'mysql' ) );
+
+        // Create a new post.
+        $id = wp_insert_post(
+            apply_filters(
+                'getpaid_new_item_data',
+                array(
+                    'post_date'    => $item->get_date_created( 'edit' ),
+                    'post_type'    => 'wpi_item',
+                    'post_status'  => $this->get_post_status( $item ),
+                    'ping_status'  => 'closed',
+                    'post_author'  => $item->get_author( 'edit' ),
+                    'post_title'   => $item->get_name( 'edit' ),
+                    'post_parent'  => $item->get_parent_id(),
+                    'post_excerpt' => $item->get_description( 'edit' ),
+                )
+            ),
+            true
+        );
+
+        if ( $id && ! is_wp_error( $id ) ) {
+            $item->set_id( $id );
+            $this->update_post_meta( $item );
+            $item->save_meta_data();
+            $item->apply_changes();
+            $this->clear_caches( $item );
+            do_action( 'getpaid_new_item', $item );
+            return true;
+        }
+
+        if ( is_wp_error( $id ) ) {
+            $item->last_error = $id->get_error_message();
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read an item from the database.
+     *
+     * @param WPInv_Item $item Item object.
+     *
+     */
+    public function read( &$item ) {
+
+        $item->set_defaults();
+        $item_object = get_post( $item->get_id() );
+
+        if ( ! $item->get_id() || ! $item_object || $item_object->post_type != 'wpi_item' ) {
+            $item->last_error = __( 'Invalid item.', 'invoicing' );
+            $item->set_id( 0 );
+            return false;
+        }
+
+        $item->set_props(
+            array(
+                'parent_id'     => $item_object->post_parent,
+                'date_created'  => 0 < $item_object->post_date ? $item_object->post_date : null,
+                'date_modified' => 0 < $item_object->post_modified ? $item_object->post_modified : null,
+                'status'        => $item_object->post_status,
+                'name'          => $item_object->post_title,
+                'description'   => $item_object->post_excerpt,
+                'author'        => $item_object->post_author,
+            )
+        );
+
+        $this->read_object_data( $item, $item_object );
+        $item->read_meta_data();
+        $item->set_object_read( true );
+        do_action( 'getpaid_read_item', $item );
+
+    }
+
+    /**
+     * Method to update an item in the database.
+     *
+     * @param WPInv_Item $item Item object.
+     */
+    public function update( &$item ) {
+        $item->save_meta_data();
+        $item->set_version( WPINV_VERSION );
+
+        if ( null === $item->get_date_created( 'edit' ) ) {
+            $item->set_date_created( current_time( 'mysql' ) );
+        }
+
+        // Grab the current status so we can compare.
+        $previous_status = get_post_status( $item->get_id() );
+
+        $changes = $item->get_changes();
+
+        // Only update the post when the post data changes.
+        if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author' ), array_keys( $changes ) ) ) {
+            $post_data = array(
+                'post_date'     => $item->get_date_created( 'edit' ),
+                'post_status'   => $item->get_status( 'edit' ),
+                'post_parent'   => $item->get_parent_id( 'edit' ),
+                'post_excerpt'  => $item->get_description( 'edit' ),
+                'post_modified' => $item->get_date_modified( 'edit' ),
+                'post_title'    => $item->get_name( 'edit' ),
+                'post_author'   => $item->get_author( 'edit' ),
+            );
+
+            /**
+             * When updating this object, to prevent infinite loops, use $wpdb
+             * to update data, since wp_update_post spawns more calls to the
+             * save_post action.
+             *
+             * This ensures hooks are fired by either WP itself (admin screen save),
+             * or an update purely from CRUD.
+             */
+            if ( doing_action( 'save_post' ) ) {
+                $GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $item->get_id() ) );
+                clean_post_cache( $item->get_id() );
+            } else {
+                wp_update_post( array_merge( array( 'ID' => $item->get_id() ), $post_data ) );
+            }
+            $item->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+        }
+        $this->update_post_meta( $item );
+        $item->apply_changes();
+        $this->clear_caches( $item );
+
+        // Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
+        $new_status = $item->get_status( 'edit' );
+
+        if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
+            do_action( 'getpaid_new_item', $item );
+        } else {
+            do_action( 'getpaid_update_item', $item );
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Helper method that updates all the post meta for an item based on it's settings in the WPInv_Item class.
-	 *
-	 * @param WPInv_Item $item WPInv_Item object.
-	 * @since 1.0.19
-	 */
-	protected function update_post_meta( &$item ) {
+    /**
+     * Helper method that updates all the post meta for an item based on it's settings in the WPInv_Item class.
+     *
+     * @param WPInv_Item $item WPInv_Item object.
+     * @since 1.0.19
+     */
+    protected function update_post_meta( &$item ) {
 
-		// Ensure that we have a custom id.
+        // Ensure that we have a custom id.
         if ( ! $item->get_custom_id() ) {
             $item->set_custom_id( $item->get_id() );
-		}
+        }
 
-		parent::update_post_meta( $item );
-	}
+        parent::update_post_meta( $item );
+    }
 
 }

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

Indentation +878 added lines, -878 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,199 +10,199 @@ 
 class GetPaid_Payment_Form_Submission {
 
     /**
-	 * Submission ID
-	 *
-	 * @var string
-	 */
-	public $id = null;
-
-	/**
-	 * The raw submission data.
-	 *
-	 * @var array
-	 */
-	protected $data = null;
-
-	/**
-	 * Submission totals
-	 *
-	 * @var array
-	 */
-	protected $totals = array(
-
-		'subtotal' => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'discount' => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'fees'     => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'taxes'    => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'shipping' => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-	);
-
-	/**
-	 * Sets the associated payment form.
-	 *
-	 * @var GetPaid_Payment_Form
-	 */
+     * Submission ID
+     *
+     * @var string
+     */
+    public $id = null;
+
+    /**
+     * The raw submission data.
+     *
+     * @var array
+     */
+    protected $data = null;
+
+    /**
+     * Submission totals
+     *
+     * @var array
+     */
+    protected $totals = array(
+
+        'subtotal' => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'discount' => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'fees'     => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'taxes'    => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'shipping' => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+    );
+
+    /**
+     * Sets the associated payment form.
+     *
+     * @var GetPaid_Payment_Form
+     */
     protected $payment_form = null;
 
     /**
-	 * The country for the submission.
-	 *
-	 * @var string
-	 */
-	public $country = null;
-
-    /**
-	 * The state for the submission.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $state = null;
-
-	/**
-	 * The invoice associated with the submission.
-	 *
-	 * @var WPInv_Invoice
-	 */
-	protected $invoice = null;
-
-	/**
-	 * The recurring item for the submission.
-	 *
-	 * @var int
-	 */
-	public $has_recurring = 0;
-
-	/**
-	 * An array of fees for the submission.
-	 *
-	 * @var array
-	 */
-	protected $fees = array();
-
-	/**
-	 * An array of discounts for the submission.
-	 *
-	 * @var array
-	 */
-	protected $discounts = array();
-
-	/**
-	 * An array of taxes for the submission.
-	 *
-	 * @var array
-	 */
-	protected $taxes = array();
-
-	/**
-	 * An array of items for the submission.
-	 *
-	 * @var GetPaid_Form_Item[]
-	 */
-	protected $items = array();
-
-	/**
-	 * The last error.
-	 *
-	 * @var string
-	 */
-	public $last_error = null;
-
-	/**
-	 * The last error code.
-	 *
-	 * @var string
-	 */
-	public $last_error_code = null;
-
-    /**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-
-		// Set the state and country to the default state and country.
-		$this->country = wpinv_default_billing_country();
-		$this->state   = wpinv_get_default_state();
-
-		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
-		}
-
-	}
-
-	/**
-	 * Loads submission data.
-	 *
-	 * @param array $data
-	 */
-	public function load_data( $data ) {
-
-		// Allow plugins to filter the data.
-		$data       = apply_filters( 'getpaid_submission_data', $data, $this );
-
-		// Cache it...
-		$this->data = $data;
-
-		// Then generate a unique id from the data.
-		$this->id   = md5( wp_json_encode( $data ) );
-
-		// Finally, process the submission.
-		try {
-
-			// Each process is passed an instance of the class (with reference)
-			// and should throw an Exception whenever it encounters one.
-			$processors = apply_filters(
-				'getpaid_payment_form_submission_processors',
-				array(
-					array( $this, 'process_payment_form' ),
-					array( $this, 'process_invoice' ),
-					array( $this, 'process_fees' ),
-					array( $this, 'process_items' ),
-					array( $this, 'process_discount' ),
-					array( $this, 'process_taxes' ),
-				),
-				$this
-			);
-
-			foreach ( $processors as $processor ) {
-				call_user_func_array( $processor, array( &$this ) );
-			}
-		} catch ( GetPaid_Payment_Exception $e ) {
-			$this->last_error      = $e->getMessage();
-			$this->last_error_code = $e->getErrorCode();
-		} catch ( Exception $e ) {
-			$this->last_error      = $e->getMessage();
-			$this->last_error_code = $e->getCode();
-		}
-
-		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
-
-	}
-
-	/*
+     * The country for the submission.
+     *
+     * @var string
+     */
+    public $country = null;
+
+    /**
+     * The state for the submission.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $state = null;
+
+    /**
+     * The invoice associated with the submission.
+     *
+     * @var WPInv_Invoice
+     */
+    protected $invoice = null;
+
+    /**
+     * The recurring item for the submission.
+     *
+     * @var int
+     */
+    public $has_recurring = 0;
+
+    /**
+     * An array of fees for the submission.
+     *
+     * @var array
+     */
+    protected $fees = array();
+
+    /**
+     * An array of discounts for the submission.
+     *
+     * @var array
+     */
+    protected $discounts = array();
+
+    /**
+     * An array of taxes for the submission.
+     *
+     * @var array
+     */
+    protected $taxes = array();
+
+    /**
+     * An array of items for the submission.
+     *
+     * @var GetPaid_Form_Item[]
+     */
+    protected $items = array();
+
+    /**
+     * The last error.
+     *
+     * @var string
+     */
+    public $last_error = null;
+
+    /**
+     * The last error code.
+     *
+     * @var string
+     */
+    public $last_error_code = null;
+
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+
+        // Set the state and country to the default state and country.
+        $this->country = wpinv_default_billing_country();
+        $this->state   = wpinv_get_default_state();
+
+        // Do we have an actual submission?
+        if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
+            $this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
+        }
+
+    }
+
+    /**
+     * Loads submission data.
+     *
+     * @param array $data
+     */
+    public function load_data( $data ) {
+
+        // Allow plugins to filter the data.
+        $data       = apply_filters( 'getpaid_submission_data', $data, $this );
+
+        // Cache it...
+        $this->data = $data;
+
+        // Then generate a unique id from the data.
+        $this->id   = md5( wp_json_encode( $data ) );
+
+        // Finally, process the submission.
+        try {
+
+            // Each process is passed an instance of the class (with reference)
+            // and should throw an Exception whenever it encounters one.
+            $processors = apply_filters(
+                'getpaid_payment_form_submission_processors',
+                array(
+                    array( $this, 'process_payment_form' ),
+                    array( $this, 'process_invoice' ),
+                    array( $this, 'process_fees' ),
+                    array( $this, 'process_items' ),
+                    array( $this, 'process_discount' ),
+                    array( $this, 'process_taxes' ),
+                ),
+                $this
+            );
+
+            foreach ( $processors as $processor ) {
+                call_user_func_array( $processor, array( &$this ) );
+            }
+        } catch ( GetPaid_Payment_Exception $e ) {
+            $this->last_error      = $e->getMessage();
+            $this->last_error_code = $e->getErrorCode();
+        } catch ( Exception $e ) {
+            $this->last_error      = $e->getMessage();
+            $this->last_error_code = $e->getCode();
+        }
+
+        // Fired when we are done processing a submission.
+        do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Payment Forms.
 	|--------------------------------------------------------------------------
@@ -211,39 +211,39 @@ 
 	| submission has an active payment form etc.
     */
 
-	/**
-	 * Prepares the submission's payment form.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_payment_form() {
+    /**
+     * Prepares the submission's payment form.
+     *
+     * @since 1.0.19
+     */
+    public function process_payment_form() {
 
-		// Every submission needs an active payment form.
-		if ( empty( $this->data['form_id'] ) ) {
-			throw new Exception( __( 'Missing payment form', 'invoicing' ) );
-		}
+        // Every submission needs an active payment form.
+        if ( empty( $this->data['form_id'] ) ) {
+            throw new Exception( __( 'Missing payment form', 'invoicing' ) );
+        }
 
-		// Fetch the payment form.
-		$this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
+        // Fetch the payment form.
+        $this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
 
-		if ( ! $this->payment_form->is_active() ) {
-			throw new Exception( __( 'Payment form not active', 'invoicing' ) );
-		}
+        if ( ! $this->payment_form->is_active() ) {
+            throw new Exception( __( 'Payment form not active', 'invoicing' ) );
+        }
 
-		do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
-	}
+        do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
+    }
 
     /**
-	 * Returns the payment form.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Payment_Form
-	 */
-	public function get_payment_form() {
-		return $this->payment_form;
-	}
+     * Returns the payment form.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Payment_Form
+     */
+    public function get_payment_form() {
+        return $this->payment_form;
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Invoices.
 	|--------------------------------------------------------------------------
@@ -252,95 +252,95 @@ 
 	| might be for an existing invoice.
 	*/
 
-	/**
-	 * Prepares the submission's invoice.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_invoice() {
-
-		// Abort if there is no invoice.
-		if ( empty( $this->data['invoice_id'] ) ) {
-
-			// Check if we are resuming a payment.
-			if ( empty( $this->data['maybe_use_invoice'] ) ) {
-				return;
-			}
-
-			$invoice = wpinv_get_invoice( $this->data['maybe_use_invoice'] );
-			if ( empty( $invoice ) || ! $invoice->has_status( 'draft, auto-draft, wpi-pending' ) ) {
-				return;
-			}
-		}
-
-		// If the submission is for an existing invoice, ensure that it exists
-		// and that it is not paid for.
-		if ( empty( $invoice ) ) {
-			$invoice = wpinv_get_invoice( $this->data['invoice_id'] );
-		}
+    /**
+     * Prepares the submission's invoice.
+     *
+     * @since 1.0.19
+     */
+    public function process_invoice() {
+
+        // Abort if there is no invoice.
+        if ( empty( $this->data['invoice_id'] ) ) {
+
+            // Check if we are resuming a payment.
+            if ( empty( $this->data['maybe_use_invoice'] ) ) {
+                return;
+            }
+
+            $invoice = wpinv_get_invoice( $this->data['maybe_use_invoice'] );
+            if ( empty( $invoice ) || ! $invoice->has_status( 'draft, auto-draft, wpi-pending' ) ) {
+                return;
+            }
+        }
+
+        // If the submission is for an existing invoice, ensure that it exists
+        // and that it is not paid for.
+        if ( empty( $invoice ) ) {
+            $invoice = wpinv_get_invoice( $this->data['invoice_id'] );
+        }
 
         if ( empty( $invoice ) ) {
-			throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
-		}
-
-		if ( $invoice->is_paid() ) {
-			throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
-		}
-
-		$this->payment_form->invoice = $invoice;
-		if ( ! $this->payment_form->is_default() ) {
-
-			$items    = array();
-			$item_ids = array();
-
-			foreach ( $invoice->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
-					$item_ids[] = $item->get_id();
-					$items[]    = $item;
-				}
-			}
-
-			foreach ( $this->payment_form->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
-					$item_ids[] = $item->get_id();
-					$items[]    = $item;
-				}
-			}
-
-			$this->payment_form->set_items( $items );
-
-		} else {
-			$this->payment_form->set_items( $invoice->get_items() );
-		}
-
-		$this->country = $invoice->get_country();
-		$this->state   = $invoice->get_state();
-		$this->invoice = $invoice;
-
-		do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
-	}
-
-	/**
-	 * Returns the associated invoice.
-	 *
-	 * @since 1.0.19
-	 * @return WPInv_Invoice
-	 */
-	public function get_invoice() {
-		return $this->invoice;
-	}
-
-	/**
-	 * Checks whether there is an invoice associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_invoice() {
-		return ! empty( $this->invoice );
-	}
-
-	/*
+            throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
+        }
+
+        if ( $invoice->is_paid() ) {
+            throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
+        }
+
+        $this->payment_form->invoice = $invoice;
+        if ( ! $this->payment_form->is_default() ) {
+
+            $items    = array();
+            $item_ids = array();
+
+            foreach ( $invoice->get_items() as $item ) {
+                if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    $item_ids[] = $item->get_id();
+                    $items[]    = $item;
+                }
+            }
+
+            foreach ( $this->payment_form->get_items() as $item ) {
+                if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    $item_ids[] = $item->get_id();
+                    $items[]    = $item;
+                }
+            }
+
+            $this->payment_form->set_items( $items );
+
+        } else {
+            $this->payment_form->set_items( $invoice->get_items() );
+        }
+
+        $this->country = $invoice->get_country();
+        $this->state   = $invoice->get_state();
+        $this->invoice = $invoice;
+
+        do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
+    }
+
+    /**
+     * Returns the associated invoice.
+     *
+     * @since 1.0.19
+     * @return WPInv_Invoice
+     */
+    public function get_invoice() {
+        return $this->invoice;
+    }
+
+    /**
+     * Checks whether there is an invoice associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_invoice() {
+        return ! empty( $this->invoice );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Items.
 	|--------------------------------------------------------------------------
@@ -349,129 +349,129 @@ 
 	| recurring item. But can have an unlimited number of non-recurring items.
 	*/
 
-	/**
-	 * Prepares the submission's items.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_items() {
-
-		$processor = new GetPaid_Payment_Form_Submission_Items( $this );
-
-		foreach ( $processor->items as $item ) {
-			$this->add_item( $item );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
-	}
-
-	/**
-	 * Adds an item to the submission.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 */
-	public function add_item( $item ) {
-
-		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
-			return;
-		}
-
-		// Each submission can only contain one recurring item.
-		if ( $item->is_recurring() ) {
-			$this->has_recurring = $item->get_id();
-		}
-
-		// Update the items and totals.
-		$this->items[ $item->get_id() ]         = $item;
-		$this->totals['subtotal']['initial']   += $item->get_sub_total();
-		$this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
-
-	}
-
-	/**
-	 * Removes a specific item.
-	 *
-	 * You should not call this method after the discounts and taxes
-	 * have been calculated.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_item( $item_id ) {
-
-		if ( isset( $this->items[ $item_id ] ) ) {
-			$this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
-			$this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
-
-			if ( $this->items[ $item_id ]->is_recurring() ) {
-				$this->has_recurring = 0;
-			}
-
-			unset( $this->items[ $item_id ] );
-		}
-
-	}
-
-	/**
-	 * Returns the subtotal.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_subtotal() {
-
-		if ( wpinv_prices_include_tax() ) {
-			return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
-		}
-
-		return $this->totals['subtotal']['initial'];
-	}
-
-	/**
-	 * Returns the recurring subtotal.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_subtotal() {
-
-		if ( wpinv_prices_include_tax() ) {
-			return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
-		}
-
-		return $this->totals['subtotal']['recurring'];
-	}
-
-	/**
-	 * Returns all items.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Form_Item[]
-	 */
-	public function get_items() {
-		return $this->items;
-	}
-
-	/**
-	 * Checks if there's a single subscription group in the submission.
-	 *
-	 * @since 2.3.0
-	 * @return bool
-	 */
-	public function has_subscription_group() {
-		return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
-	}
-
-	/**
-	 * Checks if there are multipe subscription groups in the submission.
-	 *
-	 * @since 2.3.0
-	 * @return bool
-	 */
-	public function has_multiple_subscription_groups() {
-		return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
-	}
-
-	/*
+    /**
+     * Prepares the submission's items.
+     *
+     * @since 1.0.19
+     */
+    public function process_items() {
+
+        $processor = new GetPaid_Payment_Form_Submission_Items( $this );
+
+        foreach ( $processor->items as $item ) {
+            $this->add_item( $item );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
+    }
+
+    /**
+     * Adds an item to the submission.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     */
+    public function add_item( $item ) {
+
+        // Make sure that it is available for purchase.
+        if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
+            return;
+        }
+
+        // Each submission can only contain one recurring item.
+        if ( $item->is_recurring() ) {
+            $this->has_recurring = $item->get_id();
+        }
+
+        // Update the items and totals.
+        $this->items[ $item->get_id() ]         = $item;
+        $this->totals['subtotal']['initial']   += $item->get_sub_total();
+        $this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
+
+    }
+
+    /**
+     * Removes a specific item.
+     *
+     * You should not call this method after the discounts and taxes
+     * have been calculated.
+     *
+     * @since 1.0.19
+     */
+    public function remove_item( $item_id ) {
+
+        if ( isset( $this->items[ $item_id ] ) ) {
+            $this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
+            $this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
+
+            if ( $this->items[ $item_id ]->is_recurring() ) {
+                $this->has_recurring = 0;
+            }
+
+            unset( $this->items[ $item_id ] );
+        }
+
+    }
+
+    /**
+     * Returns the subtotal.
+     *
+     * @since 1.0.19
+     */
+    public function get_subtotal() {
+
+        if ( wpinv_prices_include_tax() ) {
+            return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
+        }
+
+        return $this->totals['subtotal']['initial'];
+    }
+
+    /**
+     * Returns the recurring subtotal.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_subtotal() {
+
+        if ( wpinv_prices_include_tax() ) {
+            return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
+        }
+
+        return $this->totals['subtotal']['recurring'];
+    }
+
+    /**
+     * Returns all items.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Form_Item[]
+     */
+    public function get_items() {
+        return $this->items;
+    }
+
+    /**
+     * Checks if there's a single subscription group in the submission.
+     *
+     * @since 2.3.0
+     * @return bool
+     */
+    public function has_subscription_group() {
+        return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
+    }
+
+    /**
+     * Checks if there are multipe subscription groups in the submission.
+     *
+     * @since 2.3.0
+     * @return bool
+     */
+    public function has_multiple_subscription_groups() {
+        return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Taxes
 	|--------------------------------------------------------------------------
@@ -480,128 +480,128 @@ 
 	| or only one-time.
     */
 
-	/**
-	 * Prepares the submission's taxes.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_taxes() {
-
-		// Abort if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
-			return;
-		}
-
-		// If a custom country && state has been passed in, use it to calculate taxes.
-		$country = $this->get_field( 'wpinv_country', 'billing' );
-		if ( ! empty( $country ) ) {
-			$this->country = $country;
-		}
-
-		$state = $this->get_field( 'wpinv_state', 'billing' );
-		if ( ! empty( $state ) ) {
-			$this->state = $state;
-		}
-
-		// Confirm if the provided country and the ip country are similar.
-		$address_confirmed = $this->get_field( 'confirm-address' );
-		if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
-			throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
-		}
-
-		// Abort if the country is not taxable.
-		if ( ! wpinv_is_country_taxable( $this->country ) ) {
-			return;
-		}
-
-		$processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
-
-		foreach ( $processor->taxes as $tax ) {
-			$this->add_tax( $tax );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
-	}
-
-	/**
-	 * Adds a tax to the submission.
-	 *
-	 * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
-	 * @since 1.0.19
-	 */
-	public function add_tax( $tax ) {
-
-		if ( wpinv_round_tax_per_tax_rate() ) {
-			$tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
-			$tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
-		}
-
-		$this->taxes[ $tax['name'] ]         = $tax;
-		$this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
-		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
-
-	}
-
-	/**
-	 * Removes a specific tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_tax( $tax_name ) {
-
-		if ( isset( $this->taxes[ $tax_name ] ) ) {
-			$this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
-			$this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
-			unset( $this->taxes[ $tax_name ] );
-		}
-
-	}
-
-	/**
-	 * Whether or not we'll use taxes for the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function use_taxes() {
-
-		$use_taxes = wpinv_use_taxes();
-
-		if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
-			$use_taxes = false;
-		}
-
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
-
-	}
-
-	/**
-	 * Returns the tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_tax() {
-		return $this->totals['taxes']['initial'];
-	}
-
-	/**
-	 * Returns the recurring tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_tax() {
-		return $this->totals['taxes']['recurring'];
-	}
-
-	/**
-	 * Returns all taxes.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_taxes() {
-		return $this->taxes;
-	}
-
-	/*
+    /**
+     * Prepares the submission's taxes.
+     *
+     * @since 1.0.19
+     */
+    public function process_taxes() {
+
+        // Abort if we're not using taxes.
+        if ( ! $this->use_taxes() ) {
+            return;
+        }
+
+        // If a custom country && state has been passed in, use it to calculate taxes.
+        $country = $this->get_field( 'wpinv_country', 'billing' );
+        if ( ! empty( $country ) ) {
+            $this->country = $country;
+        }
+
+        $state = $this->get_field( 'wpinv_state', 'billing' );
+        if ( ! empty( $state ) ) {
+            $this->state = $state;
+        }
+
+        // Confirm if the provided country and the ip country are similar.
+        $address_confirmed = $this->get_field( 'confirm-address' );
+        if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
+            throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
+        }
+
+        // Abort if the country is not taxable.
+        if ( ! wpinv_is_country_taxable( $this->country ) ) {
+            return;
+        }
+
+        $processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
+
+        foreach ( $processor->taxes as $tax ) {
+            $this->add_tax( $tax );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
+    }
+
+    /**
+     * Adds a tax to the submission.
+     *
+     * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
+     * @since 1.0.19
+     */
+    public function add_tax( $tax ) {
+
+        if ( wpinv_round_tax_per_tax_rate() ) {
+            $tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
+            $tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
+        }
+
+        $this->taxes[ $tax['name'] ]         = $tax;
+        $this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
+        $this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
+
+    }
+
+    /**
+     * Removes a specific tax.
+     *
+     * @since 1.0.19
+     */
+    public function remove_tax( $tax_name ) {
+
+        if ( isset( $this->taxes[ $tax_name ] ) ) {
+            $this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
+            $this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
+            unset( $this->taxes[ $tax_name ] );
+        }
+
+    }
+
+    /**
+     * Whether or not we'll use taxes for the submission.
+     *
+     * @since 1.0.19
+     */
+    public function use_taxes() {
+
+        $use_taxes = wpinv_use_taxes();
+
+        if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
+            $use_taxes = false;
+        }
+
+        return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+
+    }
+
+    /**
+     * Returns the tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_tax() {
+        return $this->totals['taxes']['initial'];
+    }
+
+    /**
+     * Returns the recurring tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_tax() {
+        return $this->totals['taxes']['recurring'];
+    }
+
+    /**
+     * Returns all taxes.
+     *
+     * @since 1.0.19
+     */
+    public function get_taxes() {
+        return $this->taxes;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Discounts
 	|--------------------------------------------------------------------------
@@ -610,99 +610,99 @@ 
 	| or only one-time. They also do not have to come from a discount code.
     */
 
-	/**
-	 * Prepares the submission's discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_discount() {
-
-		$initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
-		$recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
-		$processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
-
-		foreach ( $processor->discounts as $discount ) {
-			$this->add_discount( $discount );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
-	}
-
-	/**
-	 * Adds a discount to the submission.
-	 *
-	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
-	 * @since 1.0.19
-	 */
-	public function add_discount( $discount ) {
-		$this->discounts[ $discount['name'] ]   = $discount;
-		$this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
-		$this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
-	}
-
-	/**
-	 * Removes a discount from the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_discount( $name ) {
-
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
-			$this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
-			unset( $this->discounts[ $name ] );
-		}
-
-	}
-
-	/**
-	 * Checks whether there is a discount code associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_discount_code() {
-		return ! empty( $this->discounts['discount_code'] );
-	}
-
-	/**
-	 * Returns the discount code.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_discount_code() {
-		return $this->has_discount_code() ? $this->discounts['discount_code']['discount_code'] : '';
-	}
-
-	/**
-	 * Returns the discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discount() {
-		return $this->totals['discount']['initial'];
-	}
-
-	/**
-	 * Returns the recurring discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_discount() {
-		return $this->totals['discount']['recurring'];
-	}
-
-	/**
-	 * Returns all discounts.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discounts() {
-		return $this->discounts;
-	}
-
-	/*
+    /**
+     * Prepares the submission's discount.
+     *
+     * @since 1.0.19
+     */
+    public function process_discount() {
+
+        $initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
+        $recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
+        $processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
+
+        foreach ( $processor->discounts as $discount ) {
+            $this->add_discount( $discount );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
+    }
+
+    /**
+     * Adds a discount to the submission.
+     *
+     * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
+     * @since 1.0.19
+     */
+    public function add_discount( $discount ) {
+        $this->discounts[ $discount['name'] ]   = $discount;
+        $this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
+        $this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
+    }
+
+    /**
+     * Removes a discount from the submission.
+     *
+     * @since 1.0.19
+     */
+    public function remove_discount( $name ) {
+
+        if ( isset( $this->discounts[ $name ] ) ) {
+            $this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
+            $this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
+            unset( $this->discounts[ $name ] );
+        }
+
+    }
+
+    /**
+     * Checks whether there is a discount code associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_discount_code() {
+        return ! empty( $this->discounts['discount_code'] );
+    }
+
+    /**
+     * Returns the discount code.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_discount_code() {
+        return $this->has_discount_code() ? $this->discounts['discount_code']['discount_code'] : '';
+    }
+
+    /**
+     * Returns the discount.
+     *
+     * @since 1.0.19
+     */
+    public function get_discount() {
+        return $this->totals['discount']['initial'];
+    }
+
+    /**
+     * Returns the recurring discount.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_discount() {
+        return $this->totals['discount']['recurring'];
+    }
+
+    /**
+     * Returns all discounts.
+     *
+     * @since 1.0.19
+     */
+    public function get_discounts() {
+        return $this->discounts;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Fees
 	|--------------------------------------------------------------------------
@@ -712,100 +712,100 @@ 
 	| fees.
     */
 
-	/**
-	 * Prepares the submission's fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_fees() {
-
-		$fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
-
-		foreach ( $fees_processor->fees as $fee ) {
-			$this->add_fee( $fee );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
-	}
-
-	/**
-	 * Adds a fee to the submission.
-	 *
-	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
-	 * @since 1.0.19
-	 */
-	public function add_fee( $fee ) {
-
-		if ( $fee['name'] == 'shipping' ) {
-			$this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
-			return;
-		}
-
-		$this->fees[ $fee['name'] ]         = $fee;
-		$this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-		$this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
-
-	}
-
-	/**
-	 * Removes a fee from the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_fee( $name ) {
-
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
-			$this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
-			unset( $this->fees[ $name ] );
-		}
-
-		if ( 'shipping' == $name ) {
-			$this->totals['shipping']['initial']   = 0;
-			$this->totals['shipping']['recurring'] = 0;
-		}
-
-	}
-
-	/**
-	 * Returns the fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fee() {
-		return $this->totals['fees']['initial'];
-	}
-
-	/**
-	 * Returns the recurring fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_fee() {
-		return $this->totals['fees']['recurring'];
-	}
-
-	/**
-	 * Returns all fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fees() {
-		return $this->fees;
-	}
-
-	/**
-	 * Checks if there are any fees for the form.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function has_fees() {
-		return count( $this->fees ) !== 0;
-	}
-
-	/*
+    /**
+     * Prepares the submission's fees.
+     *
+     * @since 1.0.19
+     */
+    public function process_fees() {
+
+        $fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
+
+        foreach ( $fees_processor->fees as $fee ) {
+            $this->add_fee( $fee );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
+    }
+
+    /**
+     * Adds a fee to the submission.
+     *
+     * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
+     * @since 1.0.19
+     */
+    public function add_fee( $fee ) {
+
+        if ( $fee['name'] == 'shipping' ) {
+            $this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
+            $this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+            return;
+        }
+
+        $this->fees[ $fee['name'] ]         = $fee;
+        $this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
+        $this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+
+    }
+
+    /**
+     * Removes a fee from the submission.
+     *
+     * @since 1.0.19
+     */
+    public function remove_fee( $name ) {
+
+        if ( isset( $this->fees[ $name ] ) ) {
+            $this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
+            $this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
+            unset( $this->fees[ $name ] );
+        }
+
+        if ( 'shipping' == $name ) {
+            $this->totals['shipping']['initial']   = 0;
+            $this->totals['shipping']['recurring'] = 0;
+        }
+
+    }
+
+    /**
+     * Returns the fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_fee() {
+        return $this->totals['fees']['initial'];
+    }
+
+    /**
+     * Returns the recurring fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_fee() {
+        return $this->totals['fees']['recurring'];
+    }
+
+    /**
+     * Returns all fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_fees() {
+        return $this->fees;
+    }
+
+    /**
+     * Checks if there are any fees for the form.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function has_fees() {
+        return count( $this->fees ) !== 0;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| MISC
 	|--------------------------------------------------------------------------
@@ -813,147 +813,147 @@ 
 	| Extra submission functions.
     */
 
-	/**
-	 * Returns the shipping amount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_shipping() {
-		return $this->totals['shipping']['initial'];
-	}
-
-	/**
-	 * Returns the recurring shipping.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_shipping() {
-		return $this->totals['shipping']['recurring'];
-	}
-
-	/**
-	 * Checks if there are any shipping fees for the form.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function has_shipping() {
-		return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
-	}
-
-	/**
-	 * Checks if this is the initial fetch.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function is_initial_fetch() {
-		return isset( $this->data['initial_state'] ) && empty( $this->data['initial_state'] );
-	}
-
-	/**
-	 * Returns the total amount to collect for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_total() {
-		$total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
-		return max( $total, 0 );
-	}
-
-	/**
-	 * Returns the recurring total amount to collect for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_total() {
-		$total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
-		return max( $total, 0 );
-	}
-
-	/**
-	 * Whether payment details should be collected for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function should_collect_payment_details() {
-		$initial   = $this->get_total();
-		$recurring = $this->get_recurring_total();
-
-		if ( $this->has_recurring == 0 ) {
-			$recurring = 0;
-		}
-
-		$collect = $initial > 0 || $recurring > 0;
-		return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this );
-	}
-
-	/**
-	 * Returns the billing email of the user.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_billing_email() {
-		return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this );
-	}
-
-	/**
-	 * Checks if the submitter has a billing email.
-	 *
-	 * @since 1.0.19
-	 */
-	public function has_billing_email() {
-		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email ) && is_email( $billing_email );
-	}
-
-	/**
-	 * Returns the appropriate currency for the submission.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_currency() {
-		return $this->has_invoice() ? $this->invoice->get_currency() : wpinv_get_currency();
-    }
-
-    /**
-	 * Returns the raw submission data.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_data() {
-		return $this->data;
-	}
-
-	/**
-	 * Returns a field from the submission data
-	 *
-	 * @param string $field
-	 * @since 1.0.19
-	 * @return mixed|null
-	 */
-	public function get_field( $field, $sub_array_key = null ) {
-		return getpaid_get_array_field( $this->data, $field, $sub_array_key );
-	}
-
-	/**
-	 * Checks if a required field is set.
-	 *
-	 * @since 1.0.19
-	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
-	}
-
-	/**
-	 * Formats an amount
-	 *
-	 * @since 1.0.19
-	 */
-	public function format_amount( $amount ) {
-		return wpinv_price( $amount, $this->get_currency() );
-	}
+    /**
+     * Returns the shipping amount.
+     *
+     * @since 1.0.19
+     */
+    public function get_shipping() {
+        return $this->totals['shipping']['initial'];
+    }
+
+    /**
+     * Returns the recurring shipping.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_shipping() {
+        return $this->totals['shipping']['recurring'];
+    }
+
+    /**
+     * Checks if there are any shipping fees for the form.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function has_shipping() {
+        return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
+    }
+
+    /**
+     * Checks if this is the initial fetch.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function is_initial_fetch() {
+        return isset( $this->data['initial_state'] ) && empty( $this->data['initial_state'] );
+    }
+
+    /**
+     * Returns the total amount to collect for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_total() {
+        $total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
+        return max( $total, 0 );
+    }
+
+    /**
+     * Returns the recurring total amount to collect for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_total() {
+        $total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
+        return max( $total, 0 );
+    }
+
+    /**
+     * Whether payment details should be collected for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function should_collect_payment_details() {
+        $initial   = $this->get_total();
+        $recurring = $this->get_recurring_total();
+
+        if ( $this->has_recurring == 0 ) {
+            $recurring = 0;
+        }
+
+        $collect = $initial > 0 || $recurring > 0;
+        return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this );
+    }
+
+    /**
+     * Returns the billing email of the user.
+     *
+     * @since 1.0.19
+     */
+    public function get_billing_email() {
+        return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this );
+    }
+
+    /**
+     * Checks if the submitter has a billing email.
+     *
+     * @since 1.0.19
+     */
+    public function has_billing_email() {
+        $billing_email = $this->get_billing_email();
+        return ! empty( $billing_email ) && is_email( $billing_email );
+    }
+
+    /**
+     * Returns the appropriate currency for the submission.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_currency() {
+        return $this->has_invoice() ? $this->invoice->get_currency() : wpinv_get_currency();
+    }
+
+    /**
+     * Returns the raw submission data.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_data() {
+        return $this->data;
+    }
+
+    /**
+     * Returns a field from the submission data
+     *
+     * @param string $field
+     * @since 1.0.19
+     * @return mixed|null
+     */
+    public function get_field( $field, $sub_array_key = null ) {
+        return getpaid_get_array_field( $this->data, $field, $sub_array_key );
+    }
+
+    /**
+     * Checks if a required field is set.
+     *
+     * @since 1.0.19
+     */
+    public function is_required_field_set( $field ) {
+        return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+    }
+
+    /**
+     * Formats an amount
+     *
+     * @since 1.0.19
+     */
+    public function format_amount( $amount ) {
+        return wpinv_price( $amount, $this->get_currency() );
+    }
 
 }

templates/invoice/line-totals.php

Indentation +5 added lines, -5 removed lines

@@ -52,27 +52,27 @@
 
                                 // Total Fee.
                                 if ( 'fee' === $key ) {
-								wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
                                 }
 
                                 // Total discount.
                                 if ( 'discount' === $key ) {
-								wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
                                 }
 
                                 // Shipping.
                                 if ( 'shipping' === $key ) {
-								wpinv_the_price( $invoice->get_shipping(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_shipping(), $invoice->get_currency() );
                                 }
 
                                 // Sub total.
                                 if ( 'subtotal' === $key ) {
-								wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
                                 }
 
                                 // Total.
                                 if ( 'total' === $key ) {
-								wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
                                 }
 
                                 // Fires when printing a cart total.

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

Indentation +276 added lines, -276 removed lines

@@ -12,294 +12,294 @@
  */
 class GetPaid_Reports_Helper {
 
-	/**
-	 * Get report totals such as invoice totals and discount amounts.
-	 *
-	 * Data example:
-	 *
-	 * 'subtotal' => array(
-	 *     'type'     => 'invoice_data',
-	 *     'function' => 'SUM',
-	 *     'name'     => 'subtotal'
-	 * )
-	 *
-	 * @param  array $args
-	 * @return mixed depending on query_type
-	 */
-	public static function get_invoice_report_data( $args = array() ) {
-		global $wpdb;
-
-		$default_args = array(
-			'data'                  => array(), // The data to retrieve.
-			'where'                 => array(), // An array of where queries.
-			'query_type'            => 'get_row', // wpdb query to run.
-			'group_by'              => '', // What to group results by.
-			'order_by'              => '', // What to order by.
-			'limit'                 => '', // Results limit.
-			'filter_range'          => array(), // An array of before and after dates to limit results by.
-			'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
-			'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
-			'parent_invoice_status' => false, // Optionally filter by parent invoice status.
-		);
-
-		$args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
-		$args         = wp_parse_args( $args, $default_args );
-
-		extract( $args );
-
-		if ( empty( $data ) ) {
-			return '';
-		}
-
-		$query           = array();
-		$query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
-		$query['from']   = "FROM {$wpdb->posts} AS posts";
-		$query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
-
-		$query['where']  = "
+    /**
+     * Get report totals such as invoice totals and discount amounts.
+     *
+     * Data example:
+     *
+     * 'subtotal' => array(
+     *     'type'     => 'invoice_data',
+     *     'function' => 'SUM',
+     *     'name'     => 'subtotal'
+     * )
+     *
+     * @param  array $args
+     * @return mixed depending on query_type
+     */
+    public static function get_invoice_report_data( $args = array() ) {
+        global $wpdb;
+
+        $default_args = array(
+            'data'                  => array(), // The data to retrieve.
+            'where'                 => array(), // An array of where queries.
+            'query_type'            => 'get_row', // wpdb query to run.
+            'group_by'              => '', // What to group results by.
+            'order_by'              => '', // What to order by.
+            'limit'                 => '', // Results limit.
+            'filter_range'          => array(), // An array of before and after dates to limit results by.
+            'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
+            'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
+            'parent_invoice_status' => false, // Optionally filter by parent invoice status.
+        );
+
+        $args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
+        $args         = wp_parse_args( $args, $default_args );
+
+        extract( $args );
+
+        if ( empty( $data ) ) {
+            return '';
+        }
+
+        $query           = array();
+        $query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
+        $query['from']   = "FROM {$wpdb->posts} AS posts";
+        $query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
+
+        $query['where']  = "
 			WHERE 	posts.post_type 	IN ( '" . implode( "','", $invoice_types ) . "' )
 			";
 
-		if ( ! empty( $invoice_status ) ) {
-			$query['where'] .= "
+        if ( ! empty( $invoice_status ) ) {
+            $query['where'] .= "
 				AND 	posts.post_status 	IN ( '" . implode( "','", $invoice_status ) . "' )
 			";
-		}
-
-		if ( ! empty( $parent_invoice_status ) ) {
-			if ( ! empty( $invoice_status ) ) {
-				$query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
-			} else {
-				$query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
-			}
-		}
-
-		if ( ! empty( $filter_range['before'] ) ) {
-			$query['where'] .= "
+        }
+
+        if ( ! empty( $parent_invoice_status ) ) {
+            if ( ! empty( $invoice_status ) ) {
+                $query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
+            } else {
+                $query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
+            }
+        }
+
+        if ( ! empty( $filter_range['before'] ) ) {
+            $query['where'] .= "
 				AND 	posts.post_date <= '" . gmdate( 'Y-m-d 23:59:59', strtotime( $filter_range['before'] ) ) . "'
 			";
-		}
+        }
 
-		if ( ! empty( $filter_range['after'] ) ) {
-			$query['where'] .= "
+        if ( ! empty( $filter_range['after'] ) ) {
+            $query['where'] .= "
 				AND 	posts.post_date >= '" . gmdate( 'Y-m-d 00:00:00', strtotime( $filter_range['after'] ) ) . "'
 			";
-		}
+        }
 
-		if ( ! empty( $where ) ) {
+        if ( ! empty( $where ) ) {
 
-			foreach ( $where as $value ) {
+            foreach ( $where as $value ) {
 
-				if ( strtolower( $value['operator'] ) === 'in' || strtolower( $value['operator'] ) === 'not in' ) {
-
-					if ( is_array( $value['value'] ) ) {
-						$value['value'] = implode( "','", $value['value'] );
-					}
-
-					if ( ! empty( $value['value'] ) ) {
-						$where_value = "{$value['operator']} ('{$value['value']}')";
-					}
-				} else {
-					$where_value = "{$value['operator']} '{$value['value']}'";
-				}
-
-				if ( ! empty( $where_value ) ) {
-					$query['where'] .= " AND {$value['key']} {$where_value}";
-				}
-			}
-		}
-
-		if ( $group_by ) {
-			$query['group_by'] = "GROUP BY {$group_by}";
-		}
-
-		if ( $order_by ) {
-			$query['order_by'] = "ORDER BY {$order_by}";
-		}
-
-		if ( $limit ) {
-			$query['limit'] = "LIMIT {$limit}";
-		}
-
-		$query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
-		$query = implode( ' ', $query );
-
-		return self::execute( $query_type, $query );
-
-	}
-
-	/**
-	 * Prepares the data to select.
-	 *
-	 *
-	 * @param  array $data
-	 * @return array
-	 */
-	public static function prepare_invoice_data( $data ) {
-
-		$prepared = array();
-
-		foreach ( $data as $raw_key => $value ) {
-			$key      = sanitize_key( $raw_key );
-			$distinct = '';
-
-			if ( isset( $value['distinct'] ) ) {
-				$distinct = 'DISTINCT';
-			}
-
-			$get_key = self::get_invoice_table_key( $key, $value['type'] );
-
-			if ( false === $get_key ) {
-				// Skip to the next foreach iteration else the query will be invalid.
-				continue;
-			}
-
-			if ( ! empty( $value['function'] ) ) {
-				$get = "{$value['function']}({$distinct} {$get_key})";
-			} else {
-				$get = "{$distinct} {$get_key}";
-			}
-
-			$prepared[] = "{$get} as {$value['name']}";
-		}
-
-		return $prepared;
-
-	}
-
-	/**
-	 * Prepares the joins to use.
-	 *
-	 *
-	 * @param  array $data
-	 * @param  bool $with_parent
-	 * @return array
-	 */
-	public static function prepare_invoice_joins( $data, $with_parent ) {
-		global $wpdb;
-
-		$prepared = array();
-
-		foreach ( $data as $raw_key => $value ) {
-			$join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
-			$type      = isset( $value['type'] ) ? $value['type'] : false;
-			$key       = sanitize_key( $raw_key );
-
-			switch ( $type ) {
-				case 'meta':
-					$prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
-					break;
-				case 'parent_meta':
-					$prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
-					break;
-				case 'invoice_data':
-					$prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
-					break;
-				case 'invoice_item':
-					$prepared['invoice_items'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoice_items AS invoice_items ON posts.ID = invoice_items.post_id";
-					break;
-			}
-		}
-
-		if ( $with_parent ) {
-			$prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
-		}
-
-		return $prepared;
-
-	}
-
-	/**
-	 * Retrieves the appropriate table key to use.
-	 *
-	 *
-	 * @param  string $key
-	 * @param  string $table
-	 * @return string|false
-	 */
-	public static function get_invoice_table_key( $key, $table ) {
-
-		$keys = array(
-			'meta'         => "meta_{$key}.meta_value",
-			'parent_meta'  => "parent_meta_{$key}.meta_value",
-			'post_data'    => "posts.{$key}",
-			'invoice_data' => "invoices.{$key}",
-			'invoice_item' => "invoice_items.{$key}",
-		);
-
-		return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
-
-	}
-
-	/**
-	 * Executes a query and caches the result for a minute.
-	 *
-	 *
-	 * @param  string $query_type
-	 * @param  string $query
-	 * @return mixed depending on query_type
-	 */
-	public static function execute( $query_type, $query ) {
-		global $wpdb;
-
-		$query_hash = md5( $query_type . $query );
-		$result     = self::get_cached_query( $query_hash );
-		if ( $result === false ) {
-			self::enable_big_selects();
-
-			$result = $wpdb->$query_type( $query );
-			self::set_cached_query( $query_hash, $result );
-		}
-
-		return $result;
-
-	}
-
-	/**
-	 * Enables big mysql selects for reports, just once for this session.
-	 */
-	protected static function enable_big_selects() {
-		static $big_selects = false;
-
-		global $wpdb;
-
-		if ( ! $big_selects ) {
-			$wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
-			$big_selects = true;
-		}
-	}
-
-	/**
-	 * Get the cached query result or null if it's not in the cache.
-	 *
-	 * @param string $query_hash The query hash.
-	 *
-	 * @return mixed|false The cache contents on success, false on failure to retrieve contents.
-	 */
-	protected static function get_cached_query( $query_hash ) {
-
-		return wp_cache_get(
-			$query_hash,
-			strtolower( __CLASS__ )
-		);
-
-	}
-
-	/**
-	 * Set the cached query result.
-	 *
-	 * @param string $query_hash The query hash.
-	 * @param mixed  $data The data to cache.
-	 */
-	protected static function set_cached_query( $query_hash, $data ) {
-
-		wp_cache_set(
-			$query_hash,
-			$data,
-			strtolower( __CLASS__ ),
-			MINUTE_IN_SECONDS
-		);
-
-	}
+                if ( strtolower( $value['operator'] ) === 'in' || strtolower( $value['operator'] ) === 'not in' ) {
+
+                    if ( is_array( $value['value'] ) ) {
+                        $value['value'] = implode( "','", $value['value'] );
+                    }
+
+                    if ( ! empty( $value['value'] ) ) {
+                        $where_value = "{$value['operator']} ('{$value['value']}')";
+                    }
+                } else {
+                    $where_value = "{$value['operator']} '{$value['value']}'";
+                }
+
+                if ( ! empty( $where_value ) ) {
+                    $query['where'] .= " AND {$value['key']} {$where_value}";
+                }
+            }
+        }
+
+        if ( $group_by ) {
+            $query['group_by'] = "GROUP BY {$group_by}";
+        }
+
+        if ( $order_by ) {
+            $query['order_by'] = "ORDER BY {$order_by}";
+        }
+
+        if ( $limit ) {
+            $query['limit'] = "LIMIT {$limit}";
+        }
+
+        $query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
+        $query = implode( ' ', $query );
+
+        return self::execute( $query_type, $query );
+
+    }
+
+    /**
+     * Prepares the data to select.
+     *
+     *
+     * @param  array $data
+     * @return array
+     */
+    public static function prepare_invoice_data( $data ) {
+
+        $prepared = array();
+
+        foreach ( $data as $raw_key => $value ) {
+            $key      = sanitize_key( $raw_key );
+            $distinct = '';
+
+            if ( isset( $value['distinct'] ) ) {
+                $distinct = 'DISTINCT';
+            }
+
+            $get_key = self::get_invoice_table_key( $key, $value['type'] );
+
+            if ( false === $get_key ) {
+                // Skip to the next foreach iteration else the query will be invalid.
+                continue;
+            }
+
+            if ( ! empty( $value['function'] ) ) {
+                $get = "{$value['function']}({$distinct} {$get_key})";
+            } else {
+                $get = "{$distinct} {$get_key}";
+            }
+
+            $prepared[] = "{$get} as {$value['name']}";
+        }
+
+        return $prepared;
+
+    }
+
+    /**
+     * Prepares the joins to use.
+     *
+     *
+     * @param  array $data
+     * @param  bool $with_parent
+     * @return array
+     */
+    public static function prepare_invoice_joins( $data, $with_parent ) {
+        global $wpdb;
+
+        $prepared = array();
+
+        foreach ( $data as $raw_key => $value ) {
+            $join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
+            $type      = isset( $value['type'] ) ? $value['type'] : false;
+            $key       = sanitize_key( $raw_key );
+
+            switch ( $type ) {
+                case 'meta':
+                    $prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
+                    break;
+                case 'parent_meta':
+                    $prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
+                    break;
+                case 'invoice_data':
+                    $prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
+                    break;
+                case 'invoice_item':
+                    $prepared['invoice_items'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoice_items AS invoice_items ON posts.ID = invoice_items.post_id";
+                    break;
+            }
+        }
+
+        if ( $with_parent ) {
+            $prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
+        }
+
+        return $prepared;
+
+    }
+
+    /**
+     * Retrieves the appropriate table key to use.
+     *
+     *
+     * @param  string $key
+     * @param  string $table
+     * @return string|false
+     */
+    public static function get_invoice_table_key( $key, $table ) {
+
+        $keys = array(
+            'meta'         => "meta_{$key}.meta_value",
+            'parent_meta'  => "parent_meta_{$key}.meta_value",
+            'post_data'    => "posts.{$key}",
+            'invoice_data' => "invoices.{$key}",
+            'invoice_item' => "invoice_items.{$key}",
+        );
+
+        return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
+
+    }
+
+    /**
+     * Executes a query and caches the result for a minute.
+     *
+     *
+     * @param  string $query_type
+     * @param  string $query
+     * @return mixed depending on query_type
+     */
+    public static function execute( $query_type, $query ) {
+        global $wpdb;
+
+        $query_hash = md5( $query_type . $query );
+        $result     = self::get_cached_query( $query_hash );
+        if ( $result === false ) {
+            self::enable_big_selects();
+
+            $result = $wpdb->$query_type( $query );
+            self::set_cached_query( $query_hash, $result );
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Enables big mysql selects for reports, just once for this session.
+     */
+    protected static function enable_big_selects() {
+        static $big_selects = false;
+
+        global $wpdb;
+
+        if ( ! $big_selects ) {
+            $wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
+            $big_selects = true;
+        }
+    }
+
+    /**
+     * Get the cached query result or null if it's not in the cache.
+     *
+     * @param string $query_hash The query hash.
+     *
+     * @return mixed|false The cache contents on success, false on failure to retrieve contents.
+     */
+    protected static function get_cached_query( $query_hash ) {
+
+        return wp_cache_get(
+            $query_hash,
+            strtolower( __CLASS__ )
+        );
+
+    }
+
+    /**
+     * Set the cached query result.
+     *
+     * @param string $query_hash The query hash.
+     * @param mixed  $data The data to cache.
+     */
+    protected static function set_cached_query( $query_hash, $data ) {
+
+        wp_cache_set(
+            $query_hash,
+            $data,
+            strtolower( __CLASS__ ),
+            MINUTE_IN_SECONDS
+        );
+
+    }
 
 }

templates/subscriptions/subscription-details.php

Indentation +46 added lines, -46 removed lines

@@ -39,62 +39,62 @@ 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+                        switch ( $key ) {
 
-						case 'status':
-							echo esc_html( $subscription->get_status_label() );
-							break;
+                        case 'status':
+                            echo esc_html( $subscription->get_status_label() );
+                            break;
 
-						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
-							break;
+                        case 'start_date':
+                            echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+                            break;
 
-						case 'expiry_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
-							break;
+                        case 'expiry_date':
+                            echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
+                            break;
 
-						case 'initial_amount':
-							echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
+                        case 'initial_amount':
+                            echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
 
-							if ( $subscription->has_trial_period() ) {
+                            if ( $subscription->has_trial_period() ) {
 
-								echo "<small class='text-muted'>&nbsp;";
-								printf(
-									esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
-									esc_html( $subscription->get_trial_period() )
-								);
-								echo '</small>';
+                                echo "<small class='text-muted'>&nbsp;";
+                                printf(
+                                    esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
+                                    esc_html( $subscription->get_trial_period() )
+                                );
+                                echo '</small>';
 
-							}
+                            }
 
-							break;
+                            break;
 
-						case 'recurring_amount':
-							$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-							$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-							echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
-							break;
+                        case 'recurring_amount':
+                            $frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+                            $amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
+                            echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
+                            break;
 
-						case 'item':
-							if ( empty( $subscription_group ) ) {
-								echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
-							} else {
-								$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-								echo wp_kses_post( implode( ' | ', $markup ) );
-							}
+                        case 'item':
+                            if ( empty( $subscription_group ) ) {
+                                echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+                            } else {
+                                $markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
+                                echo wp_kses_post( implode( ' | ', $markup ) );
+                            }
 
-							break;
+                            break;
 
-						case 'payments':
-							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+                        case 'payments':
+                            $max_activations = (int) $subscription->get_bill_times();
+                            echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
 
-							break;
+                            break;
 
-						}
-						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
+                        }
+                        do_action( "getpaid_render_single_subscription_column_$key", $subscription );
 
-					?>
+                    ?>
 				</td>
 
 			</tr>
@@ -121,17 +121,17 @@ 
 <span class="form-text">
 
 	<?php
-		if ( $subscription->can_cancel() ) {
-		printf(
+        if ( $subscription->can_cancel() ) {
+        printf(
             '<a href="%s" class="btn btn-danger btn-sm" onclick="return confirm(\'%s\')">%s</a>&nbsp;&nbsp;',
             esc_url( $subscription->get_cancel_url() ),
             esc_attr__( 'Are you sure you want to cancel this subscription?', 'invoicing' ),
             esc_html__( 'Cancel Subscription', 'invoicing' )
         );
-		}
+        }
 
-		do_action( 'getpaid-single-subscription-page-actions', $subscription );
-	?>
+        do_action( 'getpaid-single-subscription-page-actions', $subscription );
+    ?>
 
 	<a href="<?php echo esc_url( getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) ); ?>" class="btn btn-secondary btn-sm"><?php esc_html_e( 'Go Back', 'invoicing' ); ?></a>
 </span>

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

Indentation +277 added lines, -277 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -16,85 +16,85 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Address {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
-
-		// Prepare the invoice.
-		$invoice  = new WPInv_Invoice( $post );
-		$customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-		$customer = new WP_User( $customer );
-		$display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-		wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
-
-		// Address fields.
-		$address_fields = array(
-			'first_name' => array(
-				'label' => __( 'First Name', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'last_name'  => array(
-				'label' => __( 'Last Name', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'company'    => array(
-				'label' => __( 'Company', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'vat_number' => array(
-				'label' => __( 'VAT Number', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'address'    => array(
-				'label' => __( 'Address', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'city'       => array(
-				'label' => __( 'City', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'country'    => array(
-				'label'       => __( 'Country', 'invoicing' ),
-				'type'        => 'select',
-				'class'       => 'getpaid-recalculate-prices-on-change',
-				'options'     => wpinv_get_country_list(),
-				'placeholder' => __( 'Choose a country', 'invoicing' ),
-			),
-			'state'      => array(
-				'label' => __( 'State', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'zip'        => array(
-				'label' => __( 'Zip', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'phone'      => array(
-				'label' => __( 'Phone', 'invoicing' ),
-				'type'  => 'text',
-			),
-		);
-
-		$states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
-
-		if ( ! empty( $states ) ) {
-			$address_fields['state']['type']        = 'select';
-			$address_fields['state']['options']     = $states;
-			$address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
-		}
-
-		// Maybe remove the VAT field.
-		if ( ! wpinv_use_taxes() ) {
-			unset( $address_fields['vat_number'] );
-		}
-
-		$address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
-		?>
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
+
+        // Prepare the invoice.
+        $invoice  = new WPInv_Invoice( $post );
+        $customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
+        $customer = new WP_User( $customer );
+        $display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
+        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+
+        // Address fields.
+        $address_fields = array(
+            'first_name' => array(
+                'label' => __( 'First Name', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'last_name'  => array(
+                'label' => __( 'Last Name', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'company'    => array(
+                'label' => __( 'Company', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'vat_number' => array(
+                'label' => __( 'VAT Number', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'address'    => array(
+                'label' => __( 'Address', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'city'       => array(
+                'label' => __( 'City', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'country'    => array(
+                'label'       => __( 'Country', 'invoicing' ),
+                'type'        => 'select',
+                'class'       => 'getpaid-recalculate-prices-on-change',
+                'options'     => wpinv_get_country_list(),
+                'placeholder' => __( 'Choose a country', 'invoicing' ),
+            ),
+            'state'      => array(
+                'label' => __( 'State', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'zip'        => array(
+                'label' => __( 'Zip', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'phone'      => array(
+                'label' => __( 'Phone', 'invoicing' ),
+                'type'  => 'text',
+            ),
+        );
+
+        $states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+
+        if ( ! empty( $states ) ) {
+            $address_fields['state']['type']        = 'select';
+            $address_fields['state']['options']     = $states;
+            $address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
+        }
+
+        // Maybe remove the VAT field.
+        if ( ! wpinv_use_taxes() ) {
+            unset( $address_fields['vat_number'] );
+        }
+
+        $address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
+        ?>
 
 		<style>
 			#wpinv-address label {
@@ -119,19 +119,19 @@ 
 							<div id="getpaid-invoice-email-wrapper" class="d-none">
 								<input type="hidden" id="getpaid-invoice-create-new-user" name="wpinv_new_user" value="" />
 								<?php
-									aui()->input(
-										array(
-											'type'        => 'text',
-											'id'          => 'getpaid-invoice-new-user-email',
-											'name'        => 'wpinv_email',
-											'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
-											'label_type'  => 'vertical',
-											'placeholder' => 'john@doe.com',
-											'class'       => 'form-control-sm',
-										),
-										true
-									);
-								?>
+                                    aui()->input(
+                                        array(
+                                            'type'        => 'text',
+                                            'id'          => 'getpaid-invoice-new-user-email',
+                                            'name'        => 'wpinv_email',
+                                            'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => 'john@doe.com',
+                                            'class'       => 'form-control-sm',
+                                        ),
+                                        true
+                                    );
+                                ?>
 							</div>
 						</div>
 						<div class="col-12 col-sm-6 form-group mb-3 mt-sm-4">
@@ -155,39 +155,39 @@ 
 							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr( $key ); ?>--wrapper">
 								<?php
 
-									if ( 'select' === $field['type'] ) {
-										aui()->select(
-											array(
-												'id'               => 'wpinv_' . $key,
-												'name'             => 'wpinv_' . $key,
-												'label'            => $field['label'],
-												'label_type'       => 'vertical',
-												'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'            => $invoice->get( $key, 'edit' ),
-												'options'          => $field['options'],
-												'data-allow-clear' => 'false',
-												'select2'          => true,
-											),
-											true
-										);
-									} else {
-										aui()->input(
-											array(
-												'type'        => $field['type'],
-												'id'          => 'wpinv_' . $key,
-												'name'        => 'wpinv_' . $key,
-												'label'       => $field['label'],
-												'label_type'  => 'vertical',
-												'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'       => $invoice->get( $key, 'edit' ),
-											),
-											true
-										);
-									}
-
-								?>
+                                    if ( 'select' === $field['type'] ) {
+                                        aui()->select(
+                                            array(
+                                                'id'               => 'wpinv_' . $key,
+                                                'name'             => 'wpinv_' . $key,
+                                                'label'            => $field['label'],
+                                                'label_type'       => 'vertical',
+                                                'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
+                                                'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
+                                                'value'            => $invoice->get( $key, 'edit' ),
+                                                'options'          => $field['options'],
+                                                'data-allow-clear' => 'false',
+                                                'select2'          => true,
+                                            ),
+                                            true
+                                        );
+                                    } else {
+                                        aui()->input(
+                                            array(
+                                                'type'        => $field['type'],
+                                                'id'          => 'wpinv_' . $key,
+                                                'name'        => 'wpinv_' . $key,
+                                                'label'       => $field['label'],
+                                                'label_type'  => 'vertical',
+                                                'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
+                                                'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
+                                                'value'       => $invoice->get( $key, 'edit' ),
+                                            ),
+                                            true
+                                        );
+                                    }
+
+                                ?>
 							</div>
 						<?php endforeach; ?>
 					</div>
@@ -198,48 +198,48 @@ 
 						<div class="row">
 							<div class="col-12 col-sm-6">
 								<?php
-									aui()->select(
-										array(
-											'id'          => 'wpinv_template',
-											'name'        => 'wpinv_template',
-											'label'       => __( 'Template', 'invoicing' ),
-											'label_type'  => 'vertical',
-											'placeholder' => __( 'Choose a template', 'invoicing' ),
-											'class'       => 'form-control-sm',
-											'value'       => $invoice->get_template( 'edit' ),
-											'options'     => array(
-												'quantity' => __( 'Quantity', 'invoicing' ),
-												'hours'    => __( 'Hours', 'invoicing' ),
-											),
-											'data-allow-clear' => 'false',
-											'select2'     => true,
-										),
-										true
-									);
-								?>
+                                    aui()->select(
+                                        array(
+                                            'id'          => 'wpinv_template',
+                                            'name'        => 'wpinv_template',
+                                            'label'       => __( 'Template', 'invoicing' ),
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => __( 'Choose a template', 'invoicing' ),
+                                            'class'       => 'form-control-sm',
+                                            'value'       => $invoice->get_template( 'edit' ),
+                                            'options'     => array(
+                                                'quantity' => __( 'Quantity', 'invoicing' ),
+                                                'hours'    => __( 'Hours', 'invoicing' ),
+                                            ),
+                                            'data-allow-clear' => 'false',
+                                            'select2'     => true,
+                                        ),
+                                        true
+                                    );
+                                ?>
 							</div>
 							<div class="col-12 col-sm-6">
 								<?php
 
-									// Set currency.
-									aui()->select(
-										array(
-											'id'          => 'wpinv_currency',
-											'name'        => 'wpinv_currency',
-											'label'       => __( 'Currency', 'invoicing' ),
-											'label_type'  => 'vertical',
-											'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
-											'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-											'value'       => $invoice->get_currency( 'edit' ),
-											'required'    => false,
-											'data-allow-clear' => 'false',
-											'select2'     => true,
-											'options'     => wpinv_get_currencies(),
-										),
-										true
-									);
-
-								?>
+                                    // Set currency.
+                                    aui()->select(
+                                        array(
+                                            'id'          => 'wpinv_currency',
+                                            'name'        => 'wpinv_currency',
+                                            'label'       => __( 'Currency', 'invoicing' ),
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+                                            'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
+                                            'value'       => $invoice->get_currency( 'edit' ),
+                                            'required'    => false,
+                                            'data-allow-clear' => 'false',
+                                            'select2'     => true,
+                                            'options'     => wpinv_get_currencies(),
+                                        ),
+                                        true
+                                    );
+
+                                ?>
 							</div>
 						</div>
 
@@ -249,123 +249,123 @@ 
 					<div class="row">
 						<div class="col-12 col-sm-6">
 							<?php
-								aui()->input(
-									array(
-										'type'        => 'text',
-										'id'          => 'wpinv_company_id',
-										'name'        => 'wpinv_company_id',
-										'label'       => __( 'Company ID', 'invoicing' ),
-										'label_type'  => 'vertical',
-										'placeholder' => '',
-										'class'       => 'form-control-sm',
-										'value'       => $invoice->get_company_id( 'edit' ),
-									),
-									true
-								);
-							?>
+                                aui()->input(
+                                    array(
+                                        'type'        => 'text',
+                                        'id'          => 'wpinv_company_id',
+                                        'name'        => 'wpinv_company_id',
+                                        'label'       => __( 'Company ID', 'invoicing' ),
+                                        'label_type'  => 'vertical',
+                                        'placeholder' => '',
+                                        'class'       => 'form-control-sm',
+                                        'value'       => $invoice->get_company_id( 'edit' ),
+                                    ),
+                                    true
+                                );
+                            ?>
 						</div>
 					</div>
 
 					<?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
 			</div>
 		<?php
-	}
-
-	/**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 * @param array $posted the posted data.
-	 */
-	public static function save( $post_id, $posted ) {
-
-		// Prepare the invoice.
-		$invoice = new WPInv_Invoice( $post_id );
-
-		// Load new data.
-		$invoice->set_props(
-			array(
-				'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
-				'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
-				'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
-				'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
-				'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
-				'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
-				'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
-				'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
-				'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
-				'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
-				'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
-				'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
-				'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
-				'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
-				'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
-				'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
-				'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
-				'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
-				'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
-				'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
-				'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
-				'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
-			)
-		);
-
-		// Discount code.
-		if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-
-			if ( isset( $posted['wpinv_discount_code'] ) ) {
-				$invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
-			}
-
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( $discount->exists() ) {
-				$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
-			} else {
-				$invoice->remove_discount( 'discount_code' );
-			}
-
-			// Recalculate totals.
-			$invoice->recalculate_total();
-
-		}
-
-		// If we're creating a new user...
-		if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
-
-			// Attempt to create the user.
-			$user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
-
-			// If successful, update the invoice author.
-			if ( is_numeric( $user ) ) {
-				$invoice->set_author( $user );
-			} else {
-				wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
-			}
-		}
-
-		// Do not send new invoice notifications.
-		$GLOBALS['wpinv_skip_invoice_notification'] = true;
-
-		// Save the invoice.
-		$invoice->save();
-
-		// Save the user address.
-		getpaid_save_invoice_user_address( $invoice );
-
-		// Undo do not send new invoice notifications.
-		$GLOBALS['wpinv_skip_invoice_notification'] = false;
-
-		// (Maybe) send new user notification.
-		$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-		if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-			wp_send_new_user_notifications( $user, 'user' );
-		}
-
-		if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
-			getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
-		}
-
-		// Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
-	}
+    }
+
+    /**
+     * Save meta box data.
+     *
+     * @param int $post_id
+     * @param array $posted the posted data.
+     */
+    public static function save( $post_id, $posted ) {
+
+        // Prepare the invoice.
+        $invoice = new WPInv_Invoice( $post_id );
+
+        // Load new data.
+        $invoice->set_props(
+            array(
+                'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
+                'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
+                'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
+                'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
+                'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
+                'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
+                'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
+                'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
+                'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
+                'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
+                'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
+                'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
+                'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
+                'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
+                'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
+                'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
+                'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
+                'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
+                'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
+                'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
+                'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
+                'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
+            )
+        );
+
+        // Discount code.
+        if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+
+            if ( isset( $posted['wpinv_discount_code'] ) ) {
+                $invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
+            }
+
+            $discount = new WPInv_Discount( $invoice->get_discount_code() );
+            if ( $discount->exists() ) {
+                $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+            } else {
+                $invoice->remove_discount( 'discount_code' );
+            }
+
+            // Recalculate totals.
+            $invoice->recalculate_total();
+
+        }
+
+        // If we're creating a new user...
+        if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
+
+            // Attempt to create the user.
+            $user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
+
+            // If successful, update the invoice author.
+            if ( is_numeric( $user ) ) {
+                $invoice->set_author( $user );
+            } else {
+                wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+            }
+        }
+
+        // Do not send new invoice notifications.
+        $GLOBALS['wpinv_skip_invoice_notification'] = true;
+
+        // Save the invoice.
+        $invoice->save();
+
+        // Save the user address.
+        getpaid_save_invoice_user_address( $invoice );
+
+        // Undo do not send new invoice notifications.
+        $GLOBALS['wpinv_skip_invoice_notification'] = false;
+
+        // (Maybe) send new user notification.
+        $should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
+        if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
+            wp_send_new_user_notifications( $user, 'user' );
+        }
+
+        if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
+            getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+        }
+
+        // Fires after an invoice is saved.
+        do_action( 'wpinv_invoice_metabox_saved', $invoice );
+    }
 }

includes/admin/admin-pages.php

Indentation +14 added lines, -14 removed lines

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