AyeCode / invoicing

includes/gateways/class-getpaid-bank-transfer-gateway.php

Indentation +237 added lines, -237 removed lines

@@ -13,40 +13,40 @@ 
 class GetPaid_Bank_Transfer_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'bank_transfer';
 
-	/**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
-	protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change' );
+    /**
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
+    protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change' );
+
+    /**
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 8;
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 8;
-
-	/**
-	 * Bank transfer instructions.
-	 */
-	public $instructions;
-
-	/**
-	 * Locale array.
-	 */
-	public $locale;
+     * Bank transfer instructions.
+     */
+    public $instructions;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Locale array.
+     */
+    public $locale;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title                = __( 'Direct bank transfer', 'invoicing' );
@@ -54,24 +54,24 @@ 
         $this->checkout_button_text = __( 'Proceed', 'invoicing' );
         $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
-		add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-		add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
+        add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
+        add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
+        add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
+        add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
+        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
+        add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Add a transaction id.
         $invoice->set_transaction_id( $invoice->generate_key( 'bt_' ) );
@@ -92,66 +92,66 @@ 
     }
 
     /**
-	 * Output for the order received page.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function thankyou_page( $invoice ) {
+     * Output for the order received page.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    public function thankyou_page( $invoice ) {
 
         if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
+            echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
             if ( ! empty( $this->instructions ) ) {
                 echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
-			}
+            }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
         }
 
-	}
+    }
 
     /**
-	 * Add content to the WPI emails.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param string     $email_type Email format: plain text or HTML.
-	 * @param bool     $sent_to_admin Sent to admin.
-	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+     * Add content to the WPI emails.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param string     $email_type Email format: plain text or HTML.
+     * @param bool     $sent_to_admin Sent to admin.
+     */
+    public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
+            echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+            if ( $this->instructions ) {
+                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
             }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
-		}
+        }
 
     }
 
     /**
-	 * Get bank details and place into a list format.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	protected function bank_details( $invoice ) {
+     * Get bank details and place into a list format.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    protected function bank_details( $invoice ) {
 
-		// Get the invoice country and country $locale.
-		$country = $invoice->get_country();
-		$locale  = $this->get_country_locale();
+        // Get the invoice country and country $locale.
+        $country = $invoice->get_country();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
         $bank_fields = array(
             'ac_name'   => __( 'Account Name', 'invoicing' ),
@@ -170,11 +170,11 @@ 
 
             if ( ! empty( $value ) ) {
                 $bank_info[ $field ] = array(
-					'label' => $label,
-					'value' => $value,
-				);
+                    'label' => $label,
+                    'value' => $value,
+                );
             }
-		}
+        }
 
         $bank_info = apply_filters( 'wpinv_bank_info', $bank_info, $invoice );
 
@@ -182,139 +182,139 @@ 
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+        echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+
+        echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+
+        foreach ( $bank_info as $key => $data ) {
+            echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
+        }
+
+        echo '</table>';
+
+    }
 
-		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+    /**
+     * Get country locale if localized.
+     *
+     * @return array
+     */
+    public function get_country_locale() {
+
+        if ( empty( $this->locale ) ) {
+
+            // Locale information to be used - only those that are not 'Sort Code'.
+            $this->locale = apply_filters(
+                'getpaid_get_bank_transfer_locale',
+                array(
+                    'AU' => array(
+                        'sortcode' => array(
+                            'label' => __( 'BSB', 'invoicing' ),
+                        ),
+                    ),
+                    'CA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank transit number', 'invoicing' ),
+                        ),
+                    ),
+                    'IN' => array(
+                        'sortcode' => array(
+                            'label' => __( 'IFSC', 'invoicing' ),
+                        ),
+                    ),
+                    'IT' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch sort', 'invoicing' ),
+                        ),
+                    ),
+                    'NZ' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'SE' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'US' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Routing number', 'invoicing' ),
+                        ),
+                    ),
+                    'ZA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch code', 'invoicing' ),
+                        ),
+                    ),
+                )
+            );
 
-		foreach ( $bank_info as $key => $data ) {
-			echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
-		}
+        }
 
-		echo '</table>';
+        return $this->locale;
 
     }
 
     /**
-	 * Get country locale if localized.
-	 *
-	 * @return array
-	 */
-	public function get_country_locale() {
-
-		if ( empty( $this->locale ) ) {
-
-			// Locale information to be used - only those that are not 'Sort Code'.
-			$this->locale = apply_filters(
-				'getpaid_get_bank_transfer_locale',
-				array(
-					'AU' => array(
-						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
-						),
-					),
-					'CA' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
-						),
-					),
-					'IN' => array(
-						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
-						),
-					),
-					'IT' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
-						),
-					),
-					'NZ' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'SE' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'US' => array(
-						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
-						),
-					),
-					'ZA' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
-						),
-					),
-				)
-			);
-
-		}
-
-		return $this->locale;
-
-	}
-
-	/**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
 
-		$locale  = $this->get_country_locale();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $country  = wpinv_default_billing_country();
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
-		$admin_settings['bank_transfer_ac_name'] = array(
+        $admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
             'name' => __( 'Account Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ac_no'] = array(
+        $admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
             'name' => __( 'Account Number', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bank_name'] = array(
+        $admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
             'name' => __( 'Bank Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ifsc'] = array(
+        $admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
             'name' => __( 'IFSC Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_iban'] = array(
+        $admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
             'name' => __( 'IBAN', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bic'] = array(
+        $admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
             'name' => __( 'BIC/Swift Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_sort_code'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_sort_code',
-			'name' => $sortcode,
-		);
+        $admin_settings['bank_transfer_sort_code'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_sort_code',
+            'name' => $sortcode,
+        );
 
-		$admin_settings['bank_transfer_info'] = array(
+        $admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
             'name' => __( 'Instructions', 'invoicing' ),
             'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
@@ -324,17 +324,17 @@ 
             'rows' => 5,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
-	/**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+    /**
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );
@@ -342,67 +342,67 @@ 
 
         $invoice->recalculate_total();
         $invoice->save();
-	}
+    }
 
-	/**
-	 * (Maybe) renews a bank transfer subscription profile.
-	 *
-	 *
+    /**
+     * (Maybe) renews a bank transfer subscription profile.
+     *
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
+     */
+    public function maybe_renew_subscription( $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
-			$subscription->create_payment();
+            $subscription->create_payment();
         }
 
     }
 
-	/**
-	 * Process a bank transfer payment.
-	 *
-	 *
+    /**
+     * Process a bank transfer payment.
+     *
+     *
      * @param WPInv_Invoice $invoice
-	 */
-	public function invoice_paid( $invoice ) {
-
-		// Abort if not paid by bank transfer.
-		if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
-			return;
-		}
-
-		// Is it a parent payment?
-		if ( 0 == $invoice->get_parent_id() ) {
-
-			// (Maybe) activate subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-
-			if ( ! empty( $subscriptions ) ) {
-				$subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
-
-				foreach ( $subscriptions as $subscription ) {
-					if ( $subscription->exists() ) {
-						$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-						$expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
-
-						$subscription->set_next_renewal_date( $expiry );
-						$subscription->set_date_created( current_time( 'mysql' ) );
-						$subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
-						$subscription->activate();
-					}
-				}
-			}
-		} else {
-
-			$subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
-
-			// Renew the subscription.
-			if ( $subscription && $subscription->exists() ) {
-				$subscription->add_payment( array(), $invoice );
-				$subscription->renew( strtotime( $invoice->get_date_created() ) );
-			}
-		}
+     */
+    public function invoice_paid( $invoice ) {
+
+        // Abort if not paid by bank transfer.
+        if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
+            return;
+        }
+
+        // Is it a parent payment?
+        if ( 0 == $invoice->get_parent_id() ) {
+
+            // (Maybe) activate subscriptions.
+            $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+
+            if ( ! empty( $subscriptions ) ) {
+                $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+
+                foreach ( $subscriptions as $subscription ) {
+                    if ( $subscription->exists() ) {
+                        $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
+                        $expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+
+                        $subscription->set_next_renewal_date( $expiry );
+                        $subscription->set_date_created( current_time( 'mysql' ) );
+                        $subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
+                        $subscription->activate();
+                    }
+                }
+            }
+        } else {
+
+            $subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
+
+            // Renew the subscription.
+            if ( $subscription && $subscription->exists() ) {
+                $subscription->add_payment( array(), $invoice );
+                $subscription->renew( strtotime( $invoice->get_date_created() ) );
+            }
+        }
 
     }
 

Spacing +90 added lines, -90 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Bank transfer Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change' );
+	protected $supports = array('subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change');
 
     /**
 	 * Payment method order.
@@ -49,17 +49,17 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title                = __( 'Direct bank transfer', 'invoicing' );
-        $this->method_title         = __( 'Bank transfer', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed', 'invoicing' );
-        $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
+        $this->title                = __('Direct bank transfer', 'invoicing');
+        $this->method_title         = __('Bank transfer', 'invoicing');
+        $this->checkout_button_text = __('Proceed', 'invoicing');
+        $this->instructions         = apply_filters('wpinv_bank_instructions', $this->get_option('info'));
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
-		add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-		add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
+		add_action('wpinv_receipt_end', array($this, 'thankyou_page'));
+		add_action('getpaid_invoice_line_items', array($this, 'thankyou_page'), 40);
+		add_action('wpinv_pdf_content_billing', array($this, 'thankyou_page'), 11);
+		add_action('wpinv_email_invoice_details', array($this, 'email_instructions'), 10, 3);
+		add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
+		add_action('getpaid_invoice_status_publish', array($this, 'invoice_paid'), 20);
 
     }
 
@@ -71,23 +71,23 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Add a transaction id.
-        $invoice->set_transaction_id( $invoice->generate_key( 'bt_' ) );
+        $invoice->set_transaction_id($invoice->generate_key('bt_'));
 
         // Set it as pending payment.
-        if ( ! $invoice->needs_payment() ) {
+        if (!$invoice->needs_payment()) {
             $invoice->mark_paid();
-        } elseif ( ! $invoice->is_paid() ) {
-            $invoice->set_status( 'wpi-onhold' );
+        } elseif (!$invoice->is_paid()) {
+            $invoice->set_status('wpi-onhold');
         }
 
         // Save it.
         $invoice->save();
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -96,17 +96,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function thankyou_page( $invoice ) {
+	public function thankyou_page($invoice) {
 
-        if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ('bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
-            if ( ! empty( $this->instructions ) ) {
-                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
+            if (!empty($this->instructions)) {
+                echo wp_kses_post(wpautop(wptexturize($this->instructions)));
 			}
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 
 			echo '</div>';
 
@@ -121,17 +121,17 @@ 
 	 * @param string     $email_type Email format: plain text or HTML.
 	 * @param bool     $sent_to_admin Sent to admin.
 	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+	public function email_instructions($invoice, $email_type, $sent_to_admin) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+		if (!$sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+			if ($this->instructions) {
+				echo wp_kses_post(wpautop(wptexturize($this->instructions)) . PHP_EOL);
             }
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 
 			echo '</div>';
 
@@ -144,50 +144,50 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	protected function bank_details( $invoice ) {
+	protected function bank_details($invoice) {
 
 		// Get the invoice country and country $locale.
 		$country = $invoice->get_country();
 		$locale  = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
         $bank_fields = array(
-            'ac_name'   => __( 'Account Name', 'invoicing' ),
-            'ac_no'     => __( 'Account Number', 'invoicing' ),
-            'bank_name' => __( 'Bank Name', 'invoicing' ),
-            'ifsc'      => __( 'IFSC code', 'invoicing' ),
-            'iban'      => __( 'IBAN', 'invoicing' ),
-            'bic'       => __( 'BIC/Swift code', 'invoicing' ),
+            'ac_name'   => __('Account Name', 'invoicing'),
+            'ac_no'     => __('Account Number', 'invoicing'),
+            'bank_name' => __('Bank Name', 'invoicing'),
+            'ifsc'      => __('IFSC code', 'invoicing'),
+            'iban'      => __('IBAN', 'invoicing'),
+            'bic'       => __('BIC/Swift code', 'invoicing'),
             'sort_code' => $sortcode,
         );
 
         $bank_info = array();
 
-        foreach ( $bank_fields as $field => $label ) {
-            $value = $this->get_option( $field );
+        foreach ($bank_fields as $field => $label) {
+            $value = $this->get_option($field);
 
-            if ( ! empty( $value ) ) {
-                $bank_info[ $field ] = array(
+            if (!empty($value)) {
+                $bank_info[$field] = array(
 					'label' => $label,
 					'value' => $value,
 				);
             }
 		}
 
-        $bank_info = apply_filters( 'wpinv_bank_info', $bank_info, $invoice );
+        $bank_info = apply_filters('wpinv_bank_info', $bank_info, $invoice);
 
-        if ( empty( $bank_info ) ) {
+        if (empty($bank_info)) {
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html(apply_filters('wpinv_receipt_bank_details_title', __('Bank Details', 'invoicing'), $invoice)) . '</h3>' . PHP_EOL;
 
 		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
 
-		foreach ( $bank_info as $key => $data ) {
-			echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
+		foreach ($bank_info as $key => $data) {
+			echo "<tr class='getpaid-bank-transfer-" . esc_attr($key) . "'><th class='font-weight-bold'>" . wp_kses_post($data['label']) . "</th><td class='w-75'>" . wp_kses_post(wptexturize($data['value'])) . '</td></tr>' . PHP_EOL;
 		}
 
 		echo '</table>';
@@ -201,7 +201,7 @@ 
 	 */
 	public function get_country_locale() {
 
-		if ( empty( $this->locale ) ) {
+		if (empty($this->locale)) {
 
 			// Locale information to be used - only those that are not 'Sort Code'.
 			$this->locale = apply_filters(
@@ -209,42 +209,42 @@ 
 				array(
 					'AU' => array(
 						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
+							'label' => __('BSB', 'invoicing'),
 						),
 					),
 					'CA' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
+							'label' => __('Bank transit number', 'invoicing'),
 						),
 					),
 					'IN' => array(
 						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
+							'label' => __('IFSC', 'invoicing'),
 						),
 					),
 					'IT' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
+							'label' => __('Branch sort', 'invoicing'),
 						),
 					),
 					'NZ' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'SE' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'US' => array(
 						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
+							'label' => __('Routing number', 'invoicing'),
 						),
 					),
 					'ZA' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
+							'label' => __('Branch code', 'invoicing'),
 						),
 					),
 				)
@@ -261,51 +261,51 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
-        $admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['bank_transfer_desc']['std'] = __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing');
+		$admin_settings['bank_transfer_active']['desc'] = __('Enable bank transfer', 'invoicing');
 
-		$locale  = $this->get_country_locale();
+		$locale = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
 		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
 		$admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
-            'name' => __( 'Account Name', 'invoicing' ),
+            'name' => __('Account Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
-            'name' => __( 'Account Number', 'invoicing' ),
+            'name' => __('Account Number', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
-            'name' => __( 'Bank Name', 'invoicing' ),
+            'name' => __('Bank Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
-            'name' => __( 'IFSC Code', 'invoicing' ),
+            'name' => __('IFSC Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
-            'name' => __( 'IBAN', 'invoicing' ),
+            'name' => __('IBAN', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
-            'name' => __( 'BIC/Swift Code', 'invoicing' ),
+            'name' => __('BIC/Swift Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_sort_code'] = array(
@@ -316,10 +316,10 @@ 
 
 		$admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
-            'name' => __( 'Instructions', 'invoicing' ),
-            'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
+            'name' => __('Instructions', 'invoicing'),
+            'desc' => __('Instructions that will be added to the thank you page and emails.', 'invoicing'),
             'type' => 'textarea',
-            'std'  => __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' ),
+            'std'  => __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing'),
             'cols' => 50,
             'rows' => 5,
         );
@@ -334,10 +334,10 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();
@@ -350,10 +350,10 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
+        if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
 			$subscription->create_payment();
         }
 
@@ -365,42 +365,42 @@ 
 	 *
      * @param WPInv_Invoice $invoice
 	 */
-	public function invoice_paid( $invoice ) {
+	public function invoice_paid($invoice) {
 
 		// Abort if not paid by bank transfer.
-		if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
+		if ($this->id !== $invoice->get_gateway() || !$invoice->is_recurring()) {
 			return;
 		}
 
 		// Is it a parent payment?
-		if ( 0 == $invoice->get_parent_id() ) {
+		if (0 == $invoice->get_parent_id()) {
 
 			// (Maybe) activate subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+			$subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-			if ( ! empty( $subscriptions ) ) {
-				$subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+			if (!empty($subscriptions)) {
+				$subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-				foreach ( $subscriptions as $subscription ) {
-					if ( $subscription->exists() ) {
-						$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-						$expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+				foreach ($subscriptions as $subscription) {
+					if ($subscription->exists()) {
+						$duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+						$expiry   = gmdate('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-						$subscription->set_next_renewal_date( $expiry );
-						$subscription->set_date_created( current_time( 'mysql' ) );
-						$subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
+						$subscription->set_next_renewal_date($expiry);
+						$subscription->set_date_created(current_time('mysql'));
+						$subscription->set_profile_id('bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id());
 						$subscription->activate();
 					}
 				}
 			}
 		} else {
 
-			$subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
+			$subscription = getpaid_get_subscription($invoice->get_subscription_id());
 
 			// Renew the subscription.
-			if ( $subscription && $subscription->exists() ) {
-				$subscription->add_payment( array(), $invoice );
-				$subscription->renew( strtotime( $invoice->get_date_created() ) );
+			if ($subscription && $subscription->exists()) {
+				$subscription->add_payment(array(), $invoice);
+				$subscription->renew(strtotime($invoice->get_date_created()));
 			}
 		}
 

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

Indentation +37 added lines, -37 removed lines

@@ -13,30 +13,30 @@ 
 class GetPaid_Manual_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'manual';
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change' );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 11;
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 11;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title        = __( 'Test Gateway', 'invoicing' );
@@ -46,15 +46,15 @@ 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Mark it as paid.
         $invoice->mark_paid();
@@ -84,12 +84,12 @@ 
     }
 
     /**
-	 * (Maybe) renews a manual subscription profile.
-	 *
-	 *
+     * (Maybe) renews a manual subscription profile.
+     *
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
+     */
+    public function maybe_renew_subscription( $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
@@ -109,13 +109,13 @@ 
     }
 
     /**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );

Spacing +22 added lines, -22 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Manual Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change' );
+    protected $supports = array('subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change');
 
     /**
 	 * Payment method order.
@@ -39,10 +39,10 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title        = __( 'Test Gateway', 'invoicing' );
-        $this->method_title = __( 'Test Gateway', 'invoicing' );
+        $this->title        = __('Test Gateway', 'invoicing');
+        $this->method_title = __('Test Gateway', 'invoicing');
 
-        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
+        add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
     }
 
     /**
@@ -54,32 +54,32 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Mark it as paid.
         $invoice->mark_paid();
 
         // (Maybe) activate subscriptions.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-        if ( ! empty( $subscriptions ) ) {
-            $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+        if (!empty($subscriptions)) {
+            $subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-            foreach ( $subscriptions as $subscription ) {
-                if ( $subscription->exists() ) {
-                    $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-                    $expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+            foreach ($subscriptions as $subscription) {
+                if ($subscription->exists()) {
+                    $duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+                    $expiry   = gmdate('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-                    $subscription->set_next_renewal_date( $expiry );
-                    $subscription->set_date_created( current_time( 'mysql' ) );
-                    $subscription->set_profile_id( $invoice->generate_key( 'manual_sub_' . $invoice->get_id() . '_' . $subscription->get_id() ) );
+                    $subscription->set_next_renewal_date($expiry);
+                    $subscription->set_date_created(current_time('mysql'));
+                    $subscription->set_profile_id($invoice->generate_key('manual_sub_' . $invoice->get_id() . '_' . $subscription->get_id()));
                     $subscription->activate();
                 }
             }
         }
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -89,10 +89,10 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
+        if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
 
             // Renew the subscription.
             $subscription->add_payment(
@@ -115,10 +115,10 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();

includes/wpinv-subscription.php

Indentation +1049 added lines, -1049 removed lines

@@ -15,125 +15,125 @@ 
  */
 class WPInv_Subscription extends GetPaid_Data {
 
-	/**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
-	protected $data_store_name = 'subscription';
-
-	/**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'subscription';
-
-	/**
-	 * Item Data array. This is the core item data exposed in APIs.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array(
-		'customer_id'       => 0,
-		'frequency'         => 1,
-		'period'            => 'D',
-		'initial_amount'    => null,
-		'recurring_amount'  => null,
-		'bill_times'        => 0,
-		'transaction_id'    => '',
-		'parent_payment_id' => null,
-		'product_id'        => 0,
-		'created'           => '0000-00-00 00:00:00',
-		'expiration'        => '0000-00-00 00:00:00',
-		'trial_period'      => '',
-		'status'            => 'pending',
-		'profile_id'        => '',
-		'gateway'           => '',
-		'customer'          => '',
-	);
-
-	/**
-	 * Stores the status transition information.
-	 *
-	 * @since 1.0.19
-	 * @var bool
-	 */
-	protected $status_transition = false;
-
-	/**
-	 * Get the subscription if ID is passed, otherwise the subscription is new and empty.
-	 *
-	 * @param  int|string|object|WPInv_Subscription $subscription Subscription id, profile_id, or object to read.
-	 * @param  bool $deprecated
-	 */
-	function __construct( $subscription = 0, $deprecated = false ) {
-
-		parent::__construct( $subscription );
-
-		if ( ! $deprecated && ! empty( $subscription ) && is_numeric( $subscription ) ) {
-			$this->set_id( $subscription );
-		} elseif ( $subscription instanceof self ) {
-			$this->set_id( $subscription->get_id() );
-		} elseif ( $deprecated && $subscription_id = self::get_subscription_id_by_field( $subscription, 'profile_id' ) ) {
-			$this->set_id( $subscription_id );
-		} elseif ( ! empty( $subscription->id ) ) {
-			$this->set_id( $subscription->id );
-		} else {
-			$this->set_object_read( true );
-		}
-
-		// Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
-
-		if ( $this->get_id() > 0 ) {
-			$this->data_store->read( $this );
-		}
-
-	}
-
-	/**
-	 * Given an invoice id, profile id, transaction id, it returns the subscription's id.
-	 *
-	 *
-	 * @static
-	 * @param string $value
-	 * @param string $field Either invoice_id, transaction_id or profile_id.
-	 * @since 1.0.19
-	 * @return int
-	 */
-	public static function get_subscription_id_by_field( $value, $field = 'profile_id' ) {
+    /**
+     * Which data store to load.
+     *
+     * @var string
+     */
+    protected $data_store_name = 'subscription';
+
+    /**
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'subscription';
+
+    /**
+     * Item Data array. This is the core item data exposed in APIs.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array(
+        'customer_id'       => 0,
+        'frequency'         => 1,
+        'period'            => 'D',
+        'initial_amount'    => null,
+        'recurring_amount'  => null,
+        'bill_times'        => 0,
+        'transaction_id'    => '',
+        'parent_payment_id' => null,
+        'product_id'        => 0,
+        'created'           => '0000-00-00 00:00:00',
+        'expiration'        => '0000-00-00 00:00:00',
+        'trial_period'      => '',
+        'status'            => 'pending',
+        'profile_id'        => '',
+        'gateway'           => '',
+        'customer'          => '',
+    );
+
+    /**
+     * Stores the status transition information.
+     *
+     * @since 1.0.19
+     * @var bool
+     */
+    protected $status_transition = false;
+
+    /**
+     * Get the subscription if ID is passed, otherwise the subscription is new and empty.
+     *
+     * @param  int|string|object|WPInv_Subscription $subscription Subscription id, profile_id, or object to read.
+     * @param  bool $deprecated
+     */
+    function __construct( $subscription = 0, $deprecated = false ) {
+
+        parent::__construct( $subscription );
+
+        if ( ! $deprecated && ! empty( $subscription ) && is_numeric( $subscription ) ) {
+            $this->set_id( $subscription );
+        } elseif ( $subscription instanceof self ) {
+            $this->set_id( $subscription->get_id() );
+        } elseif ( $deprecated && $subscription_id = self::get_subscription_id_by_field( $subscription, 'profile_id' ) ) {
+            $this->set_id( $subscription_id );
+        } elseif ( ! empty( $subscription->id ) ) {
+            $this->set_id( $subscription->id );
+        } else {
+            $this->set_object_read( true );
+        }
+
+        // Load the datastore.
+        $this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+
+        if ( $this->get_id() > 0 ) {
+            $this->data_store->read( $this );
+        }
+
+    }
+
+    /**
+     * Given an invoice id, profile id, transaction id, it returns the subscription's id.
+     *
+     *
+     * @static
+     * @param string $value
+     * @param string $field Either invoice_id, transaction_id or profile_id.
+     * @since 1.0.19
+     * @return int
+     */
+    public static function get_subscription_id_by_field( $value, $field = 'profile_id' ) {
         global $wpdb;
 
-		// Trim the value.
-		$value = trim( $value );
+        // Trim the value.
+        $value = trim( $value );
 
-		if ( empty( $value ) ) {
-			return 0;
-		}
+        if ( empty( $value ) ) {
+            return 0;
+        }
 
-		if ( 'invoice_id' == $field ) {
-			$field = 'parent_payment_id';
-		}
+        if ( 'invoice_id' == $field ) {
+            $field = 'parent_payment_id';
+        }
 
         // Valid fields.
         $fields = array(
-			'parent_payment_id',
-			'transaction_id',
-			'profile_id',
-		);
-
-		// Ensure a field has been passed.
-		if ( empty( $field ) || ! in_array( $field, $fields ) ) {
-			return 0;
-		}
-
-		// Maybe retrieve from the cache.
-		$subscription_id   = wp_cache_get( $value, "getpaid_subscription_{$field}s_to_subscription_ids" );
-		if ( ! empty( $subscription_id ) ) {
-			return $subscription_id;
-		}
+            'parent_payment_id',
+            'transaction_id',
+            'profile_id',
+        );
+
+        // Ensure a field has been passed.
+        if ( empty( $field ) || ! in_array( $field, $fields ) ) {
+            return 0;
+        }
+
+        // Maybe retrieve from the cache.
+        $subscription_id   = wp_cache_get( $value, "getpaid_subscription_{$field}s_to_subscription_ids" );
+        if ( ! empty( $subscription_id ) ) {
+            return $subscription_id;
+        }
 
         // Fetch from the db.
         $table            = $wpdb->prefix . 'wpinv_subscriptions';
@@ -141,42 +141,42 @@ 
             $wpdb->prepare( "SELECT `id` FROM $table WHERE `$field`=%s LIMIT 1", $value )
         );
 
-		if ( empty( $subscription_id ) ) {
-			return 0;
-		}
+        if ( empty( $subscription_id ) ) {
+            return 0;
+        }
 
-		// Update the cache with our data.
-		wp_cache_set( $value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids" );
+        // Update the cache with our data.
+        wp_cache_set( $value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids" );
 
-		return $subscription_id;
-	}
+        return $subscription_id;
+    }
 
-	/**
+    /**
      * Clears the subscription's cache.
      */
     public function clear_cache() {
-		$caches = array(
-			'getpaid_subscription_parent_payment_ids_to_subscription_ids' => $this->get_parent_payment_id(),
-			'getpaid_subscription_transaction_ids_to_subscription_ids'    => $this->get_transaction_id(),
-			'getpaid_subscription_profile_ids_to_subscription_ids'        => $this->get_profile_id(),
-			'getpaid_subscriptions'                                       => $this->get_id(),
-		);
-
-		foreach ( $caches as $cache => $value ) {
-			if ( '' !== $value && false !== $value ) {
-				wp_cache_delete( $value, $cache );
-			}
-		}
-	}
-
-	/**
+        $caches = array(
+            'getpaid_subscription_parent_payment_ids_to_subscription_ids' => $this->get_parent_payment_id(),
+            'getpaid_subscription_transaction_ids_to_subscription_ids'    => $this->get_transaction_id(),
+            'getpaid_subscription_profile_ids_to_subscription_ids'        => $this->get_profile_id(),
+            'getpaid_subscriptions'                                       => $this->get_id(),
+        );
+
+        foreach ( $caches as $cache => $value ) {
+            if ( '' !== $value && false !== $value ) {
+                wp_cache_delete( $value, $cache );
+            }
+        }
+    }
+
+    /**
      * Checks if a subscription key is set.
      */
     public function _isset( $key ) {
         return isset( $this->data[ $key ] ) || method_exists( $this, "get_$key" );
-	}
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD methods
 	|--------------------------------------------------------------------------
@@ -185,544 +185,544 @@ 
 	|
     */
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Getters
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Get customer id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_customer_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'customer_id', $context );
-	}
-
-	/**
-	 * Get customer information.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return WP_User|false WP_User object on success, false on failure.
-	 */
-	public function get_customer( $context = 'view' ) {
-		return get_userdata( $this->get_customer_id( $context ) );
-	}
-
-	/**
-	 * Get parent invoice id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_parent_invoice_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'parent_payment_id', $context );
-	}
-
-	/**
-	 * Alias for self::get_parent_invoice_id().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
+    /**
+     * Get customer id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_customer_id( $context = 'view' ) {
+        return (int) $this->get_prop( 'customer_id', $context );
+    }
+
+    /**
+     * Get customer information.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return WP_User|false WP_User object on success, false on failure.
+     */
+    public function get_customer( $context = 'view' ) {
+        return get_userdata( $this->get_customer_id( $context ) );
+    }
+
+    /**
+     * Get parent invoice id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_parent_invoice_id( $context = 'view' ) {
+        return (int) $this->get_prop( 'parent_payment_id', $context );
+    }
+
+    /**
+     * Alias for self::get_parent_invoice_id().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
     public function get_parent_payment_id( $context = 'view' ) {
         return $this->get_parent_invoice_id( $context );
-	}
+    }
+
+    /**
+     * Alias for self::get_parent_invoice_id().
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_original_payment_id( $context = 'view' ) {
+        return $this->get_parent_invoice_id( $context );
+    }
+
+    /**
+     * Get parent invoice.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return WPInv_Invoice
+     */
+    public function get_parent_invoice( $context = 'view' ) {
+        return new WPInv_Invoice( $this->get_parent_invoice_id( $context ) );
+    }
+
+    /**
+     * Alias for self::get_parent_invoice().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return WPInv_Invoice
+     */
+    public function get_parent_payment( $context = 'view' ) {
+        return $this->get_parent_invoice( $context );
+    }
+
+    /**
+     * Get subscription's product id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_product_id( $context = 'view' ) {
+        return (int) $this->get_prop( 'product_id', $context );
+    }
+
+    /**
+     * Get the subscription product.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return WPInv_Item
+     */
+    public function get_product( $context = 'view' ) {
+        return new WPInv_Item( $this->get_product_id( $context ) );
+    }
+
+    /**
+     * Get parent invoice's gateway.
+     *
+     * Here for backwards compatibility.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_gateway( $context = 'view' ) {
+        return $this->get_parent_invoice( $context )->get_gateway();
+    }
+
+    /**
+     * Get the period of a renewal.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_period( $context = 'view' ) {
+        return $this->get_prop( 'period', $context );
+    }
+
+    /**
+     * Get number of periods each renewal is valid for.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_frequency( $context = 'view' ) {
+        return (int) $this->get_prop( 'frequency', $context );
+    }
+
+    /**
+     * Get the initial amount for the subscription.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_initial_amount( $context = 'view' ) {
+        return (float) wpinv_sanitize_amount( $this->get_prop( 'initial_amount', $context ) );
+    }
+
+    /**
+     * Get the recurring amount for the subscription.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_recurring_amount( $context = 'view' ) {
+        return (float) wpinv_sanitize_amount( $this->get_prop( 'recurring_amount', $context ) );
+    }
+
+    /**
+     * Get number of times that this subscription can be renewed.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_bill_times( $context = 'view' ) {
+        return (int) $this->get_prop( 'bill_times', $context );
+    }
+
+    /**
+     * Get transaction id of this subscription's parent invoice.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_transaction_id( $context = 'view' ) {
+        return $this->get_prop( 'transaction_id', $context );
+    }
+
+    /**
+     * Get the date that the subscription was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_created( $context = 'view' ) {
+        return $this->get_prop( 'created', $context );
+    }
+
+    /**
+     * Alias for self::get_created().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created( $context = 'view' ) {
+        return $this->get_created( $context );
+    }
+
+    /**
+     * Retrieves the creation date in a timestamp
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_time_created() {
+        $created = $this->get_date_created();
+        return empty( $created ) ? current_time( 'timestamp' ) : strtotime( $created, current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Get GMT date when the subscription was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created_gmt( $context = 'view' ) {
+        $date = $this->get_date_created( $context );
+
+        if ( $date ) {
+            $date = get_gmt_from_date( $date );
+        }
+        return $date;
+    }
+
+    /**
+     * Get the date that the subscription will renew.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_next_renewal_date( $context = 'view' ) {
+        return $this->get_prop( 'expiration', $context );
+    }
+
+    /**
+     * Alias for self::get_next_renewal_date().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_expiration( $context = 'view' ) {
+        return $this->get_next_renewal_date( $context );
+    }
+
+    /**
+     * Retrieves the expiration date in a timestamp
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_expiration_time() {
+        $expiration = $this->get_expiration();
+
+        if ( empty( $expiration ) || '0000-00-00 00:00:00' == $expiration ) {
+            return current_time( 'timestamp' );
+        }
+
+        $expiration = strtotime( $expiration, current_time( 'timestamp' ) );
+        return $expiration < current_time( 'timestamp' ) ? current_time( 'timestamp' ) : $expiration;
+    }
+
+    /**
+     * Get GMT date when the subscription will renew.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_next_renewal_date_gmt( $context = 'view' ) {
+        $date = $this->get_next_renewal_date( $context );
+
+        if ( $date ) {
+            $date = get_gmt_from_date( $date );
+        }
+        return $date;
+    }
+
+    /**
+     * Get the subscription's trial period.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_trial_period( $context = 'view' ) {
+        return $this->get_prop( 'trial_period', $context );
+    }
+
+    /**
+     * Get the subscription's status.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_status( $context = 'view' ) {
+        return $this->get_prop( 'status', $context );
+    }
+
+    /**
+     * Get the subscription's profile id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_profile_id( $context = 'view' ) {
+        return $this->get_prop( 'profile_id', $context );
+    }
+
+    /*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+    /**
+     * Set customer id.
+     *
+     * @since 1.0.19
+     * @param  int $value The customer's id.
+     */
+    public function set_customer_id( $value ) {
+        $this->set_prop( 'customer_id', (int) $value );
+    }
+
+    /**
+     * Set parent invoice id.
+     *
+     * @since 1.0.19
+     * @param  int $value The parent invoice id.
+     */
+    public function set_parent_invoice_id( $value ) {
+        $this->set_prop( 'parent_payment_id', (int) $value );
+    }
+
+    /**
+     * Alias for self::set_parent_invoice_id().
+     *
+     * @since 1.0.19
+     * @param  int $value The parent invoice id.
+     */
+    public function set_parent_payment_id( $value ) {
+        $this->set_parent_invoice_id( $value );
+    }
+
+    /**
+     * Alias for self::set_parent_invoice_id().
+     *
+     * @since 1.0.19
+     * @param  int $value The parent invoice id.
+     */
+    public function set_original_payment_id( $value ) {
+        $this->set_parent_invoice_id( $value );
+    }
+
+    /**
+     * Set subscription's product id.
+     *
+     * @since 1.0.19
+     * @param  int $value The subscription product id.
+     */
+    public function set_product_id( $value ) {
+        $this->set_prop( 'product_id', (int) $value );
+    }
+
+    /**
+     * Set the period of a renewal.
+     *
+     * @since 1.0.19
+     * @param  string $value The renewal period.
+     */
+    public function set_period( $value ) {
+        $this->set_prop( 'period', $value );
+    }
+
+    /**
+     * Set number of periods each renewal is valid for.
+     *
+     * @since 1.0.19
+     * @param  int $value The subscription frequency.
+     */
+    public function set_frequency( $value ) {
+        $value = empty( $value ) ? 1 : (int) $value;
+        $this->set_prop( 'frequency', absint( $value ) );
+    }
+
+    /**
+     * Set the initial amount for the subscription.
+     *
+     * @since 1.0.19
+     * @param  float $value The initial subcription amount.
+     */
+    public function set_initial_amount( $value ) {
+        $this->set_prop( 'initial_amount', wpinv_sanitize_amount( $value ) );
+    }
+
+    /**
+     * Set the recurring amount for the subscription.
+     *
+     * @since 1.0.19
+     * @param  float $value The recurring subcription amount.
+     */
+    public function set_recurring_amount( $value ) {
+        $this->set_prop( 'recurring_amount', wpinv_sanitize_amount( $value ) );
+    }
+
+    /**
+     * Set number of times that this subscription can be renewed.
+     *
+     * @since 1.0.19
+     * @param  int $value Bill times.
+     */
+    public function set_bill_times( $value ) {
+        $this->set_prop( 'bill_times', (int) $value );
+    }
+
+    /**
+     * Get transaction id of this subscription's parent invoice.
+     *
+     * @since 1.0.19
+     * @param string $value Bill times.
+     */
+    public function set_transaction_id( $value ) {
+        $this->set_prop( 'transaction_id', sanitize_text_field( $value ) );
+    }
+
+    /**
+     * Set date when this subscription started.
+     *
+     * @since 1.0.19
+     * @param string $value strtotime compliant date.
+     */
+    public function set_created( $value ) {
+        $date = strtotime( $value );
+
+        if ( $date && $value !== '0000-00-00 00:00:00' ) {
+            $this->set_prop( 'created', gmdate( 'Y-m-d H:i:s', $date ) );
+            return;
+        }
+
+        $this->set_prop( 'created', '' );
 
-	/**
-     * Alias for self::get_parent_invoice_id().
+    }
+
+    /**
+     * Alias for self::set_created().
      *
-     * @since  1.0.0
-     * @return int
+     * @since 1.0.19
+     * @param string $value strtotime compliant date.
      */
-    public function get_original_payment_id( $context = 'view' ) {
-        return $this->get_parent_invoice_id( $context );
+    public function set_date_created( $value ) {
+        $this->set_created( $value );
     }
 
-	/**
-	 * Get parent invoice.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return WPInv_Invoice
-	 */
-	public function get_parent_invoice( $context = 'view' ) {
-		return new WPInv_Invoice( $this->get_parent_invoice_id( $context ) );
-	}
-
-	/**
-	 * Alias for self::get_parent_invoice().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return WPInv_Invoice
-	 */
-    public function get_parent_payment( $context = 'view' ) {
-        return $this->get_parent_invoice( $context );
-	}
-
-	/**
-	 * Get subscription's product id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_product_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'product_id', $context );
-	}
-
-	/**
-	 * Get the subscription product.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return WPInv_Item
-	 */
-	public function get_product( $context = 'view' ) {
-		return new WPInv_Item( $this->get_product_id( $context ) );
-	}
-
-	/**
-	 * Get parent invoice's gateway.
-	 *
-	 * Here for backwards compatibility.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_gateway( $context = 'view' ) {
-		return $this->get_parent_invoice( $context )->get_gateway();
-	}
-
-	/**
-	 * Get the period of a renewal.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_period( $context = 'view' ) {
-		return $this->get_prop( 'period', $context );
-	}
-
-	/**
-	 * Get number of periods each renewal is valid for.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_frequency( $context = 'view' ) {
-		return (int) $this->get_prop( 'frequency', $context );
-	}
-
-	/**
-	 * Get the initial amount for the subscription.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_initial_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'initial_amount', $context ) );
-	}
-
-	/**
-	 * Get the recurring amount for the subscription.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_recurring_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'recurring_amount', $context ) );
-	}
-
-	/**
-	 * Get number of times that this subscription can be renewed.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_bill_times( $context = 'view' ) {
-		return (int) $this->get_prop( 'bill_times', $context );
-	}
-
-	/**
-	 * Get transaction id of this subscription's parent invoice.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_transaction_id( $context = 'view' ) {
-		return $this->get_prop( 'transaction_id', $context );
-	}
-
-	/**
-	 * Get the date that the subscription was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_created( $context = 'view' ) {
-		return $this->get_prop( 'created', $context );
-	}
-
-	/**
-	 * Alias for self::get_created().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_created( $context );
-	}
-
-	/**
-	 * Retrieves the creation date in a timestamp
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_time_created() {
-		$created = $this->get_date_created();
-		return empty( $created ) ? current_time( 'timestamp' ) : strtotime( $created, current_time( 'timestamp' ) );
-	}
-
-	/**
-	 * Get GMT date when the subscription was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created_gmt( $context = 'view' ) {
-        $date = $this->get_date_created( $context );
+    /**
+     * Set the date that the subscription will renew.
+     *
+     * @since 1.0.19
+     * @param string $value strtotime compliant date.
+     */
+    public function set_next_renewal_date( $value ) {
+        $date = strtotime( $value );
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ( $date && $value !== '0000-00-00 00:00:00' ) {
+            $this->set_prop( 'expiration', gmdate( 'Y-m-d H:i:s', $date ) );
+            return;
         }
-		return $date;
-	}
-
-	/**
-	 * Get the date that the subscription will renew.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_next_renewal_date( $context = 'view' ) {
-		return $this->get_prop( 'expiration', $context );
-	}
-
-	/**
-	 * Alias for self::get_next_renewal_date().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_expiration( $context = 'view' ) {
-		return $this->get_next_renewal_date( $context );
-	}
-
-	/**
-	 * Retrieves the expiration date in a timestamp
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_expiration_time() {
-		$expiration = $this->get_expiration();
-
-		if ( empty( $expiration ) || '0000-00-00 00:00:00' == $expiration ) {
-			return current_time( 'timestamp' );
-		}
-
-		$expiration = strtotime( $expiration, current_time( 'timestamp' ) );
-		return $expiration < current_time( 'timestamp' ) ? current_time( 'timestamp' ) : $expiration;
-	}
-
-	/**
-	 * Get GMT date when the subscription will renew.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_next_renewal_date_gmt( $context = 'view' ) {
-        $date = $this->get_next_renewal_date( $context );
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
-        }
-		return $date;
-	}
-
-	/**
-	 * Get the subscription's trial period.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_trial_period( $context = 'view' ) {
-		return $this->get_prop( 'trial_period', $context );
-	}
-
-	/**
-	 * Get the subscription's status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
-	}
-
-	/**
-	 * Get the subscription's profile id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_profile_id( $context = 'view' ) {
-		return $this->get_prop( 'profile_id', $context );
-	}
-
-	/*
-	|--------------------------------------------------------------------------
-	| Setters
-	|--------------------------------------------------------------------------
-	*/
+        $this->set_prop( 'expiration', '' );
 
-	/**
-	 * Set customer id.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The customer's id.
-	 */
-	public function set_customer_id( $value ) {
-		$this->set_prop( 'customer_id', (int) $value );
-	}
-
-	/**
-	 * Set parent invoice id.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The parent invoice id.
-	 */
-	public function set_parent_invoice_id( $value ) {
-		$this->set_prop( 'parent_payment_id', (int) $value );
-	}
-
-	/**
-	 * Alias for self::set_parent_invoice_id().
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The parent invoice id.
-	 */
-    public function set_parent_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
-	}
+    }
 
-	/**
-     * Alias for self::set_parent_invoice_id().
+    /**
+     * Alias for self::set_next_renewal_date().
      *
      * @since 1.0.19
-	 * @param  int $value The parent invoice id.
+     * @param string $value strtotime compliant date.
      */
-    public function set_original_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
-	}
-
-	/**
-	 * Set subscription's product id.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The subscription product id.
-	 */
-	public function set_product_id( $value ) {
-		$this->set_prop( 'product_id', (int) $value );
-	}
-
-	/**
-	 * Set the period of a renewal.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value The renewal period.
-	 */
-	public function set_period( $value ) {
-		$this->set_prop( 'period', $value );
-	}
-
-	/**
-	 * Set number of periods each renewal is valid for.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The subscription frequency.
-	 */
-	public function set_frequency( $value ) {
-		$value = empty( $value ) ? 1 : (int) $value;
-		$this->set_prop( 'frequency', absint( $value ) );
-	}
-
-	/**
-	 * Set the initial amount for the subscription.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value The initial subcription amount.
-	 */
-	public function set_initial_amount( $value ) {
-		$this->set_prop( 'initial_amount', wpinv_sanitize_amount( $value ) );
-	}
-
-	/**
-	 * Set the recurring amount for the subscription.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value The recurring subcription amount.
-	 */
-	public function set_recurring_amount( $value ) {
-		$this->set_prop( 'recurring_amount', wpinv_sanitize_amount( $value ) );
-	}
-
-	/**
-	 * Set number of times that this subscription can be renewed.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value Bill times.
-	 */
-	public function set_bill_times( $value ) {
-		$this->set_prop( 'bill_times', (int) $value );
-	}
-
-	/**
-	 * Get transaction id of this subscription's parent invoice.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Bill times.
-	 */
-	public function set_transaction_id( $value ) {
-		$this->set_prop( 'transaction_id', sanitize_text_field( $value ) );
-	}
-
-	/**
-	 * Set date when this subscription started.
-	 *
-	 * @since 1.0.19
-	 * @param string $value strtotime compliant date.
-	 */
-	public function set_created( $value ) {
-        $date = strtotime( $value );
+    public function set_expiration( $value ) {
+        $this->set_next_renewal_date( $value );
+    }
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'created', gmdate( 'Y-m-d H:i:s', $date ) );
+    /**
+     * Set the subscription's trial period.
+     *
+     * @since 1.0.19
+     * @param string $value trial period e.g 1 year.
+     */
+    public function set_trial_period( $value ) {
+        $this->set_prop( 'trial_period', $value );
+    }
+
+    /**
+     * Set the subscription's status.
+     *
+     * @since 1.0.19
+     * @param string $new_status    New subscription status.
+     */
+    public function set_status( $new_status ) {
+
+        // Abort if this is not a valid status;
+        if ( ! array_key_exists( $new_status, getpaid_get_subscription_statuses() ) ) {
             return;
         }
 
-		$this->set_prop( 'created', '' );
-
-	}
+        $old_status = ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $this->get_status();
+        if ( true === $this->object_read && $old_status !== $new_status ) {
+            $this->status_transition = array(
+                'from' => $old_status,
+                'to'   => $new_status,
+            );
+        }
 
-	/**
-	 * Alias for self::set_created().
-	 *
-	 * @since 1.0.19
-	 * @param string $value strtotime compliant date.
-	 */
-	public function set_date_created( $value ) {
-		$this->set_created( $value );
+        $this->set_prop( 'status', $new_status );
     }
 
-	/**
-	 * Set the date that the subscription will renew.
-	 *
-	 * @since 1.0.19
-	 * @param string $value strtotime compliant date.
-	 */
-	public function set_next_renewal_date( $value ) {
-		$date = strtotime( $value );
+    /**
+     * Set the subscription's (remote) profile id.
+     *
+     * @since 1.0.19
+     * @param  string $value the remote profile id.
+     */
+    public function set_profile_id( $value ) {
+        $this->set_prop( 'profile_id', sanitize_text_field( $value ) );
+    }
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'expiration', gmdate( 'Y-m-d H:i:s', $date ) );
-            return;
-		}
-
-		$this->set_prop( 'expiration', '' );
-
-	}
-
-	/**
-	 * Alias for self::set_next_renewal_date().
-	 *
-	 * @since 1.0.19
-	 * @param string $value strtotime compliant date.
-	 */
-	public function set_expiration( $value ) {
-		$this->set_next_renewal_date( $value );
-    }
-
-	/**
-	 * Set the subscription's trial period.
-	 *
-	 * @since 1.0.19
-	 * @param string $value trial period e.g 1 year.
-	 */
-	public function set_trial_period( $value ) {
-		$this->set_prop( 'trial_period', $value );
-	}
-
-	/**
-	 * Set the subscription's status.
-	 *
-	 * @since 1.0.19
-	 * @param string $new_status    New subscription status.
-	 */
-	public function set_status( $new_status ) {
-
-		// Abort if this is not a valid status;
-		if ( ! array_key_exists( $new_status, getpaid_get_subscription_statuses() ) ) {
-			return;
-		}
-
-		$old_status = ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $this->get_status();
-		if ( true === $this->object_read && $old_status !== $new_status ) {
-			$this->status_transition = array(
-				'from' => $old_status,
-				'to'   => $new_status,
-			);
-		}
-
-		$this->set_prop( 'status', $new_status );
-	}
-
-	/**
-	 * Set the subscription's (remote) profile id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value the remote profile id.
-	 */
-	public function set_profile_id( $value ) {
-		$this->set_prop( 'profile_id', sanitize_text_field( $value ) );
-	}
-
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Boolean methods
 	|--------------------------------------------------------------------------
@@ -731,55 +731,55 @@ 
 	|
 	*/
 
-	/**
+    /**
      * Checks if the subscription has a given status.
-	 *
-	 * @param string|array String or array of strings to check for.
-	 * @return bool
+     *
+     * @param string|array String or array of strings to check for.
+     * @return bool
      */
     public function has_status( $status ) {
         return in_array( $this->get_status(), wpinv_clean( wpinv_parse_list( $status ) ) );
-	}
+    }
 
-	/**
+    /**
      * Checks if the subscription has a trial period.
-	 *
-	 * @return bool
+     *
+     * @return bool
      */
     public function has_trial_period() {
-		$period = $this->get_trial_period();
+        $period = $this->get_trial_period();
         return ! empty( $period );
-	}
-
-	/**
-	 * Is the subscription active?
-	 *
-	 * @return bool
-	 */
-	public function is_active() {
-		return $this->has_status( 'active trialling' ) && ! $this->is_expired();
-	}
-
-	/**
-	 * Is the subscription expired?
-	 *
-	 * @return bool
-	 */
-	public function is_expired() {
-		return $this->has_status( 'expired' ) || ( $this->has_status( 'active cancelled trialling' ) && $this->get_expiration_time() < current_time( 'timestamp' ) );
-	}
-
-	/**
-	 * Is this the last renewals?
-	 *
-	 * @return bool
-	 */
-	public function is_last_renewal() {
-		$max_bills = $this->get_bill_times();
-		return ! empty( $max_bills ) && $max_bills <= $this->get_times_billed();
-	}
-
-	/*
+    }
+
+    /**
+     * Is the subscription active?
+     *
+     * @return bool
+     */
+    public function is_active() {
+        return $this->has_status( 'active trialling' ) && ! $this->is_expired();
+    }
+
+    /**
+     * Is the subscription expired?
+     *
+     * @return bool
+     */
+    public function is_expired() {
+        return $this->has_status( 'expired' ) || ( $this->has_status( 'active cancelled trialling' ) && $this->get_expiration_time() < current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Is this the last renewals?
+     *
+     * @return bool
+     */
+    public function is_last_renewal() {
+        $max_bills = $this->get_bill_times();
+        return ! empty( $max_bills ) && $max_bills <= $this->get_times_billed();
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional methods
 	|--------------------------------------------------------------------------
@@ -788,27 +788,27 @@ 
 	|
 	*/
 
-	/**
-	 * Backwards compatibilty.
-	 */
-	public function create( $data = array() ) {
+    /**
+     * Backwards compatibilty.
+     */
+    public function create( $data = array() ) {
 
-		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
-		}
+        // Set the properties.
+        if ( is_array( $data ) ) {
+            $this->set_props( $data );
+        }
 
-		// Save the item.
-		return $this->save();
+        // Save the item.
+        return $this->save();
 
-	}
+    }
 
-	/**
-	 * Backwards compatibilty.
-	 */
-	public function update( $args = array() ) {
-		return $this->create( $args );
-	}
+    /**
+     * Backwards compatibilty.
+     */
+    public function update( $args = array() ) {
+        return $this->create( $args );
+    }
 
     /**
      * Retrieve renewal payments for a subscription
@@ -818,22 +818,22 @@ 
      */
     public function get_child_payments( $hide_pending = true ) {
 
-		$statuses = array( 'publish', 'wpi-processing', 'wpi-renewal' );
+        $statuses = array( 'publish', 'wpi-processing', 'wpi-renewal' );
 
-		if ( ! $hide_pending ) {
-			$statuses = array_keys( wpinv_get_invoice_statuses() );
-		}
+        if ( ! $hide_pending ) {
+            $statuses = array_keys( wpinv_get_invoice_statuses() );
+        }
 
         return get_posts(
-			array(
-            	'post_parent' => $this->get_parent_payment_id(),
-            	'numberposts' => -1,
-            	'post_status' => $statuses,
-            	'orderby'     => 'ID',
-            	'order'       => 'ASC',
-            	'post_type'   => 'wpi_invoice',
-			)
-		);
+            array(
+                'post_parent' => $this->get_parent_payment_id(),
+                'numberposts' => -1,
+                'post_status' => $statuses,
+                'orderby'     => 'ID',
+                'order'       => 'ASC',
+                'post_type'   => 'wpi_invoice',
+            )
+        );
     }
 
     /**
@@ -843,7 +843,7 @@ 
      * @return int
      */
     public function get_total_payments() {
-		return getpaid_count_subscription_invoices( $this->get_parent_invoice_id(), $this->get_id() );
+        return getpaid_count_subscription_invoices( $this->get_parent_invoice_id(), $this->get_id() );
     }
 
     /**
@@ -867,187 +867,187 @@ 
      *
      * @since  2.4
      * @param  array $args Array of values for the payment, including amount and transaction ID
-	 * @param  WPInv_Invoice $invoice If adding an existing invoice.
+     * @param  WPInv_Invoice $invoice If adding an existing invoice.
      * @return bool
      */
     public function add_payment( $args = array(), $invoice = false ) {
 
-		// Process each payment once.
+        // Process each payment once.
         if ( ! empty( $args['transaction_id'] ) && $this->payment_exists( $args['transaction_id'] ) ) {
             return false;
         }
 
-		// Are we creating a new invoice?
-		if ( empty( $invoice ) ) {
-			$invoice = $this->create_payment( false );
+        // Are we creating a new invoice?
+        if ( empty( $invoice ) ) {
+            $invoice = $this->create_payment( false );
 
-			if ( empty( $invoice ) ) {
-				return false;
-			}
-		}
+            if ( empty( $invoice ) ) {
+                return false;
+            }
+        }
 
-		// Maybe set a transaction id.
-		if ( ! empty( $args['transaction_id'] ) ) {
-			$invoice->set_transaction_id( $args['transaction_id'] );
-		}
+        // Maybe set a transaction id.
+        if ( ! empty( $args['transaction_id'] ) ) {
+            $invoice->set_transaction_id( $args['transaction_id'] );
+        }
 
-		// Set the completed date.
-		$invoice->set_completed_date( current_time( 'mysql' ) );
+        // Set the completed date.
+        $invoice->set_completed_date( current_time( 'mysql' ) );
 
-		// And the gateway.
-		if ( ! empty( $args['gateway'] ) ) {
-			$invoice->set_gateway( $args['gateway'] );
-		}
+        // And the gateway.
+        if ( ! empty( $args['gateway'] ) ) {
+            $invoice->set_gateway( $args['gateway'] );
+        }
 
-		$invoice->set_status( 'wpi-renewal' );
-		$invoice->save();
+        $invoice->set_status( 'wpi-renewal' );
+        $invoice->save();
 
-		if ( ! $invoice->exists() ) {
-			return false;
-		}
+        if ( ! $invoice->exists() ) {
+            return false;
+        }
 
-		do_action( 'getpaid_after_create_subscription_renewal_invoice', $invoice, $this );
-		do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
+        do_action( 'getpaid_after_create_subscription_renewal_invoice', $invoice, $this );
+        do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
         do_action( 'wpinv_recurring_record_payment', $invoice->get_id(), $this->get_parent_invoice_id(), $invoice->get_recurring_total(), $invoice->get_transaction_id() );
 
         update_post_meta( $invoice->get_id(), '_wpinv_subscription_id', $this->id );
 
         return $invoice->get_id();
-	}
+    }
 
-	/**
+    /**
      * Creates a new invoice and returns it.
      *
      * @since  1.0.19
-	 * @param bool $save Whether we should save the invoice.
+     * @param bool $save Whether we should save the invoice.
      * @return WPInv_Invoice|bool
      */
     public function create_payment( $save = true ) {
 
-		$parent_invoice = $this->get_parent_payment();
-
-		if ( ! $parent_invoice->exists() ) {
-			return false;
-		}
-
-		// Duplicate the parent invoice.
-		$invoice = getpaid_duplicate_invoice( $parent_invoice );
-		$invoice->set_parent_id( $parent_invoice->get_id() );
-		$invoice->set_subscription_id( $this->get_id() );
-		$invoice->set_remote_subscription_id( $this->get_profile_id() );
-
-		// Set invoice items.
-		$subscription_group = getpaid_get_invoice_subscription_group( $parent_invoice->get_id(), $this->get_id() );
-		$allowed_items      = empty( $subscription_group ) ? array( $this->get_product_id() ) : array_keys( $subscription_group['items'] );
-		$invoice_items      = array();
-
-		foreach ( $invoice->get_items() as $item ) {
-			if ( in_array( $item->get_id(), $allowed_items ) ) {
-				$invoice_items[] = $item;
-			}
-		}
-
-		$invoice->set_items( $invoice_items );
-
-		if ( ! empty( $subscription_group['fees'] ) ) {
-			$invoice->set_fees( $subscription_group['fees'] );
-		}
-
-		// Maybe recalculate discount (Pre-GetPaid Fix).
-		$discount = new WPInv_Discount( $invoice->get_discount_code() );
-		if ( $discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount() ) {
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
-		}
-
-		$invoice->recalculate_total();
-		$invoice->set_status( 'wpi-pending' );
-
-		if ( ! $save ) {
-			return $invoice;
-		}
-
-		$invoice->save();
-
-		return $invoice->exists() ? $invoice : false;
-    }
-
-	/**
-	 * Renews or completes a subscription
-	 *
-	 * @since  1.0.0
-	 * @return int The subscription's id
-	 */
-	public function renew( $calculate_from = null ) {
-
-		// Complete subscription if applicable
-		if ( $this->is_last_renewal() ) {
-			return $this->complete();
-		}
-
-		// Calculate new expiration
-		$frequency      = $this->get_frequency();
-		$period         = $this->get_period();
-		$calculate_from = empty( $calculate_from ) ? $this->get_expiration_time() : $calculate_from;
-		$new_expiration = strtotime( "+ $frequency $period", $calculate_from );
-
-		$this->set_expiration( date( 'Y-m-d H:i:s', $new_expiration ) );
-		$this->set_status( 'active' );
-		$this->save();
-
-		do_action( 'getpaid_subscription_renewed', $this );
-
-		return $this->get_id();
-	}
-
-	/**
-	 * Marks a subscription as completed
-	 *
-	 * Subscription is completed when the number of payments matches the billing_times field
-	 *
-	 * @since  1.0.0
-	 * @return int|bool Subscription id or false if the subscription is cancelled.
-	 */
-	public function complete() {
-
-		// Only mark a subscription as complete if it's not already cancelled.
-		if ( $this->has_status( 'cancelled' ) ) {
-			return false;
-		}
-
-		$this->set_status( 'completed' );
-		return $this->save();
-
-	}
-
-	/**
-	 * Marks a subscription as expired
-	 *
-	 * @since  1.0.0
-	 * @param  bool $check_expiration
-	 * @return int|bool Subscription id or false if $check_expiration is true and expiration date is in the future.
-	 */
-	public function expire( $check_expiration = false ) {
-
-		if ( $check_expiration && $this->get_expiration_time() > current_time( 'timestamp' ) ) {
-			// Do not mark as expired since real expiration date is in the future
-			return false;
-		}
-
-		$this->set_status( 'expired' );
-		return $this->save();
-
-	}
-
-	/**
-	 * Marks a subscription as failing
-	 *
-	 * @since  2.4.2
-	 * @return int Subscription id.
-	 */
-	public function failing() {
-		$this->set_status( 'failing' );
-		return $this->save();
-	}
+        $parent_invoice = $this->get_parent_payment();
+
+        if ( ! $parent_invoice->exists() ) {
+            return false;
+        }
+
+        // Duplicate the parent invoice.
+        $invoice = getpaid_duplicate_invoice( $parent_invoice );
+        $invoice->set_parent_id( $parent_invoice->get_id() );
+        $invoice->set_subscription_id( $this->get_id() );
+        $invoice->set_remote_subscription_id( $this->get_profile_id() );
+
+        // Set invoice items.
+        $subscription_group = getpaid_get_invoice_subscription_group( $parent_invoice->get_id(), $this->get_id() );
+        $allowed_items      = empty( $subscription_group ) ? array( $this->get_product_id() ) : array_keys( $subscription_group['items'] );
+        $invoice_items      = array();
+
+        foreach ( $invoice->get_items() as $item ) {
+            if ( in_array( $item->get_id(), $allowed_items ) ) {
+                $invoice_items[] = $item;
+            }
+        }
+
+        $invoice->set_items( $invoice_items );
+
+        if ( ! empty( $subscription_group['fees'] ) ) {
+            $invoice->set_fees( $subscription_group['fees'] );
+        }
+
+        // Maybe recalculate discount (Pre-GetPaid Fix).
+        $discount = new WPInv_Discount( $invoice->get_discount_code() );
+        if ( $discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount() ) {
+            $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+        }
+
+        $invoice->recalculate_total();
+        $invoice->set_status( 'wpi-pending' );
+
+        if ( ! $save ) {
+            return $invoice;
+        }
+
+        $invoice->save();
+
+        return $invoice->exists() ? $invoice : false;
+    }
+
+    /**
+     * Renews or completes a subscription
+     *
+     * @since  1.0.0
+     * @return int The subscription's id
+     */
+    public function renew( $calculate_from = null ) {
+
+        // Complete subscription if applicable
+        if ( $this->is_last_renewal() ) {
+            return $this->complete();
+        }
+
+        // Calculate new expiration
+        $frequency      = $this->get_frequency();
+        $period         = $this->get_period();
+        $calculate_from = empty( $calculate_from ) ? $this->get_expiration_time() : $calculate_from;
+        $new_expiration = strtotime( "+ $frequency $period", $calculate_from );
+
+        $this->set_expiration( date( 'Y-m-d H:i:s', $new_expiration ) );
+        $this->set_status( 'active' );
+        $this->save();
+
+        do_action( 'getpaid_subscription_renewed', $this );
+
+        return $this->get_id();
+    }
+
+    /**
+     * Marks a subscription as completed
+     *
+     * Subscription is completed when the number of payments matches the billing_times field
+     *
+     * @since  1.0.0
+     * @return int|bool Subscription id or false if the subscription is cancelled.
+     */
+    public function complete() {
+
+        // Only mark a subscription as complete if it's not already cancelled.
+        if ( $this->has_status( 'cancelled' ) ) {
+            return false;
+        }
+
+        $this->set_status( 'completed' );
+        return $this->save();
+
+    }
+
+    /**
+     * Marks a subscription as expired
+     *
+     * @since  1.0.0
+     * @param  bool $check_expiration
+     * @return int|bool Subscription id or false if $check_expiration is true and expiration date is in the future.
+     */
+    public function expire( $check_expiration = false ) {
+
+        if ( $check_expiration && $this->get_expiration_time() > current_time( 'timestamp' ) ) {
+            // Do not mark as expired since real expiration date is in the future
+            return false;
+        }
+
+        $this->set_status( 'expired' );
+        return $this->save();
+
+    }
+
+    /**
+     * Marks a subscription as failing
+     *
+     * @since  2.4.2
+     * @return int Subscription id.
+     */
+    public function failing() {
+        $this->set_status( 'failing' );
+        return $this->save();
+    }
 
     /**
      * Marks a subscription as cancelled
@@ -1056,19 +1056,19 @@ 
      * @return int Subscription id.
      */
     public function cancel() {
-		$this->set_status( 'cancelled' );
-		return $this->save();
+        $this->set_status( 'cancelled' );
+        return $this->save();
     }
 
-	/**
-	 * Determines if a subscription can be cancelled both locally and with a payment processor.
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_cancel() {
-		return apply_filters( 'wpinv_subscription_can_cancel', $this->has_status( $this->get_cancellable_statuses() ), $this );
-	}
+    /**
+     * Determines if a subscription can be cancelled both locally and with a payment processor.
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_cancel() {
+        return apply_filters( 'wpinv_subscription_can_cancel', $this->has_status( $this->get_cancellable_statuses() ), $this );
+    }
 
     /**
      * Returns an array of subscription statuses that can be cancelled
@@ -1081,109 +1081,109 @@ 
         return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
     }
 
-	/**
-	 * Retrieves the URL to cancel subscription
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_cancel_url() {
-		$url = getpaid_get_authenticated_action_url( 'subscription_cancel', $this->get_view_url() );
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
-	}
-
-	/**
-	 * Retrieves the URL to view a subscription
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	public function get_view_url() {
-
-		$url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$url = add_query_arg( 'subscription', $this->get_id(), $url );
-
-		return apply_filters( 'getpaid_get_subscription_view_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription can be manually renewed
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be renewed manually
-	 *
-	 * @since  2.5
-	 * @return bool
-	 */
-	public function can_renew() {
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
-	}
-
-	/**
-	 * Retrieves the URL to renew a subscription
-	 *
-	 * @since  2.5
-	 * @return string
-	 */
-	public function get_renew_url() {
-		$url = wp_nonce_url(
+    /**
+     * Retrieves the URL to cancel subscription
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_cancel_url() {
+        $url = getpaid_get_authenticated_action_url( 'subscription_cancel', $this->get_view_url() );
+        return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+    }
+
+    /**
+     * Retrieves the URL to view a subscription
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    public function get_view_url() {
+
+        $url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
+        $url = add_query_arg( 'subscription', $this->get_id(), $url );
+
+        return apply_filters( 'getpaid_get_subscription_view_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription can be manually renewed
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be renewed manually
+     *
+     * @since  2.5
+     * @return bool
+     */
+    public function can_renew() {
+        return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+    }
+
+    /**
+     * Retrieves the URL to renew a subscription
+     *
+     * @since  2.5
+     * @return string
+     */
+    public function get_renew_url() {
+        $url = wp_nonce_url(
             add_query_arg(
                 array(
-					'getpaid-action' => 'renew_subscription',
-					'sub_id'         => $this->get_id,
+                    'getpaid-action' => 'renew_subscription',
+                    'sub_id'         => $this->get_id,
                 )
             ),
             'getpaid-nonce'
         );
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription can have their payment method updated
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
-	}
-
-	/**
-	 * Retrieves the URL to update subscription
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_update_url() {
-		$url = add_query_arg(
+        return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription can have their payment method updated
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_update() {
+        return apply_filters( 'wpinv_subscription_can_update', false, $this );
+    }
+
+    /**
+     * Retrieves the URL to update subscription
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_update_url() {
+        $url = add_query_arg(
             array(
-				'action'          => 'update',
-				'subscription_id' => $this->get_id(),
+                'action'          => 'update',
+                'subscription_id' => $this->get_id(),
             )
         );
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
-	}
-
-	/**
-	 * Retrieves the subscription status label
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_status_label() {
-		return getpaid_get_subscription_status_label( $this->get_status() );
-	}
-
-	/**
-	 * Retrieves the subscription status class
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	public function get_status_class() {
-		$statuses = getpaid_get_subscription_status_classes();
-		return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'bg-dark';
-	}
+        return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+    }
+
+    /**
+     * Retrieves the subscription status label
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_status_label() {
+        return getpaid_get_subscription_status_label( $this->get_status() );
+    }
+
+    /**
+     * Retrieves the subscription status class
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    public function get_status_class() {
+        $statuses = getpaid_get_subscription_status_classes();
+        return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'bg-dark';
+    }
 
     /**
      * Retrieves the subscription status label
@@ -1193,11 +1193,11 @@ 
      */
     public function get_status_label_html() {
 
-		$status_label = sanitize_text_field( $this->get_status_label() );
-		$class        = esc_attr( $this->get_status_class() );
-		$status       = sanitize_html_class( $this->get_status() );
+        $status_label = sanitize_text_field( $this->get_status_label() );
+        $class        = esc_attr( $this->get_status_class() );
+        $status       = sanitize_html_class( $this->get_status() );
 
-		return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
+        return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
     }
 
     /**
@@ -1208,75 +1208,75 @@ 
      * @return bool
      */
     public function payment_exists( $txn_id = '' ) {
-		$invoice_id = WPInv_Invoice::get_invoice_id_by_field( $txn_id, 'transaction_id' );
+        $invoice_id = WPInv_Invoice::get_invoice_id_by_field( $txn_id, 'transaction_id' );
         return ! empty( $invoice_id );
-	}
-
-	/**
-	 * Handle the status transition.
-	 */
-	protected function status_transition() {
-		$status_transition = $this->status_transition;
-
-		// Reset status transition variable.
-		$this->status_transition = false;
-
-		if ( $status_transition ) {
-			try {
-
-				// Fire a hook for the status change.
-				do_action( 'wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition );
-				do_action( 'getpaid_subscription_' . $status_transition['to'], $this, $status_transition );
-
-				if ( ! empty( $status_transition['from'] ) ) {
-
-					/* translators: 1: old subscription status 2: new subscription status */
-					$transition_note = sprintf( __( 'Subscription status changed from %1$s to %2$s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['from'] ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
-
-					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
-
-					// Fire another hook.
-					do_action( 'getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this );
-					do_action( 'getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to'] );
-
-				} else {
-					/* translators: %s: new invoice status */
-					$transition_note = sprintf( __( 'Subscription status set to %s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
-
-					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
-
-				}
-			} catch ( Exception $e ) {
-				$this->get_parent_payment()->add_note( __( 'Error during subscription status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
-			}
-		}
-
-	}
-
-	/**
-	 * Save data to the database.
-	 *
-	 * @since 1.0.19
-	 * @return int subscription ID
-	 */
-	public function save() {
-		parent::save();
-		$this->status_transition();
-		return $this->get_id();
-	}
-
-	/**
-	 * Activates a subscription.
-	 *
-	 * @since 1.0.19
-	 * @return int subscription ID
-	 */
-	public function activate() {
-		$status = $this->has_trial_period() && 'trialling' === $this->get_status() ? 'trialling' : 'active';
-		$this->set_status( $status );
-		return $this->save();
-	}
+    }
+
+    /**
+     * Handle the status transition.
+     */
+    protected function status_transition() {
+        $status_transition = $this->status_transition;
+
+        // Reset status transition variable.
+        $this->status_transition = false;
+
+        if ( $status_transition ) {
+            try {
+
+                // Fire a hook for the status change.
+                do_action( 'wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition );
+                do_action( 'getpaid_subscription_' . $status_transition['to'], $this, $status_transition );
+
+                if ( ! empty( $status_transition['from'] ) ) {
+
+                    /* translators: 1: old subscription status 2: new subscription status */
+                    $transition_note = sprintf( __( 'Subscription status changed from %1$s to %2$s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['from'] ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+
+                    // Note the transition occurred.
+                    $this->get_parent_payment()->add_note( $transition_note, false, false, true );
+
+                    // Fire another hook.
+                    do_action( 'getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this );
+                    do_action( 'getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to'] );
+
+                } else {
+                    /* translators: %s: new invoice status */
+                    $transition_note = sprintf( __( 'Subscription status set to %s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+
+                    // Note the transition occurred.
+                    $this->get_parent_payment()->add_note( $transition_note, false, false, true );
+
+                }
+            } catch ( Exception $e ) {
+                $this->get_parent_payment()->add_note( __( 'Error during subscription status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
+            }
+        }
+
+    }
+
+    /**
+     * Save data to the database.
+     *
+     * @since 1.0.19
+     * @return int subscription ID
+     */
+    public function save() {
+        parent::save();
+        $this->status_transition();
+        return $this->get_id();
+    }
+
+    /**
+     * Activates a subscription.
+     *
+     * @since 1.0.19
+     * @return int subscription ID
+     */
+    public function activate() {
+        $status = $this->has_trial_period() && 'trialling' === $this->get_status() ? 'trialling' : 'active';
+        $this->set_status( $status );
+        return $this->save();
+    }
 
 }

Spacing +232 added lines, -232 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The Subscription Class
@@ -68,27 +68,27 @@ 
 	 * @param  int|string|object|WPInv_Subscription $subscription Subscription id, profile_id, or object to read.
 	 * @param  bool $deprecated
 	 */
-	function __construct( $subscription = 0, $deprecated = false ) {
+	function __construct($subscription = 0, $deprecated = false) {
 
-		parent::__construct( $subscription );
+		parent::__construct($subscription);
 
-		if ( ! $deprecated && ! empty( $subscription ) && is_numeric( $subscription ) ) {
-			$this->set_id( $subscription );
-		} elseif ( $subscription instanceof self ) {
-			$this->set_id( $subscription->get_id() );
-		} elseif ( $deprecated && $subscription_id = self::get_subscription_id_by_field( $subscription, 'profile_id' ) ) {
-			$this->set_id( $subscription_id );
-		} elseif ( ! empty( $subscription->id ) ) {
-			$this->set_id( $subscription->id );
+		if (!$deprecated && !empty($subscription) && is_numeric($subscription)) {
+			$this->set_id($subscription);
+		} elseif ($subscription instanceof self) {
+			$this->set_id($subscription->get_id());
+		} elseif ($deprecated && $subscription_id = self::get_subscription_id_by_field($subscription, 'profile_id')) {
+			$this->set_id($subscription_id);
+		} elseif (!empty($subscription->id)) {
+			$this->set_id($subscription->id);
 		} else {
-			$this->set_object_read( true );
+			$this->set_object_read(true);
 		}
 
 		// Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+		$this->data_store = GetPaid_Data_Store::load($this->data_store_name);
 
-		if ( $this->get_id() > 0 ) {
-			$this->data_store->read( $this );
+		if ($this->get_id() > 0) {
+			$this->data_store->read($this);
 		}
 
 	}
@@ -103,17 +103,17 @@ 
 	 * @since 1.0.19
 	 * @return int
 	 */
-	public static function get_subscription_id_by_field( $value, $field = 'profile_id' ) {
+	public static function get_subscription_id_by_field($value, $field = 'profile_id') {
         global $wpdb;
 
 		// Trim the value.
-		$value = trim( $value );
+		$value = trim($value);
 
-		if ( empty( $value ) ) {
+		if (empty($value)) {
 			return 0;
 		}
 
-		if ( 'invoice_id' == $field ) {
+		if ('invoice_id' == $field) {
 			$field = 'parent_payment_id';
 		}
 
@@ -125,28 +125,28 @@ 
 		);
 
 		// Ensure a field has been passed.
-		if ( empty( $field ) || ! in_array( $field, $fields ) ) {
+		if (empty($field) || !in_array($field, $fields)) {
 			return 0;
 		}
 
 		// Maybe retrieve from the cache.
-		$subscription_id   = wp_cache_get( $value, "getpaid_subscription_{$field}s_to_subscription_ids" );
-		if ( ! empty( $subscription_id ) ) {
+		$subscription_id = wp_cache_get($value, "getpaid_subscription_{$field}s_to_subscription_ids");
+		if (!empty($subscription_id)) {
 			return $subscription_id;
 		}
 
         // Fetch from the db.
         $table            = $wpdb->prefix . 'wpinv_subscriptions';
         $subscription_id  = (int) $wpdb->get_var(
-            $wpdb->prepare( "SELECT `id` FROM $table WHERE `$field`=%s LIMIT 1", $value )
+            $wpdb->prepare("SELECT `id` FROM $table WHERE `$field`=%s LIMIT 1", $value)
         );
 
-		if ( empty( $subscription_id ) ) {
+		if (empty($subscription_id)) {
 			return 0;
 		}
 
 		// Update the cache with our data.
-		wp_cache_set( $value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids" );
+		wp_cache_set($value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids");
 
 		return $subscription_id;
 	}
@@ -162,9 +162,9 @@ 
 			'getpaid_subscriptions'                                       => $this->get_id(),
 		);
 
-		foreach ( $caches as $cache => $value ) {
-			if ( '' !== $value && false !== $value ) {
-				wp_cache_delete( $value, $cache );
+		foreach ($caches as $cache => $value) {
+			if ('' !== $value && false !== $value) {
+				wp_cache_delete($value, $cache);
 			}
 		}
 	}
@@ -172,8 +172,8 @@ 
 	/**
      * Checks if a subscription key is set.
      */
-    public function _isset( $key ) {
-        return isset( $this->data[ $key ] ) || method_exists( $this, "get_$key" );
+    public function _isset($key) {
+        return isset($this->data[$key]) || method_exists($this, "get_$key");
 	}
 
 	/*
@@ -198,8 +198,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_customer_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'customer_id', $context );
+	public function get_customer_id($context = 'view') {
+		return (int) $this->get_prop('customer_id', $context);
 	}
 
 	/**
@@ -209,8 +209,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WP_User|false WP_User object on success, false on failure.
 	 */
-	public function get_customer( $context = 'view' ) {
-		return get_userdata( $this->get_customer_id( $context ) );
+	public function get_customer($context = 'view') {
+		return get_userdata($this->get_customer_id($context));
 	}
 
 	/**
@@ -220,8 +220,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_parent_invoice_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'parent_payment_id', $context );
+	public function get_parent_invoice_id($context = 'view') {
+		return (int) $this->get_prop('parent_payment_id', $context);
 	}
 
 	/**
@@ -231,8 +231,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-    public function get_parent_payment_id( $context = 'view' ) {
-        return $this->get_parent_invoice_id( $context );
+    public function get_parent_payment_id($context = 'view') {
+        return $this->get_parent_invoice_id($context);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
      * @since  1.0.0
      * @return int
      */
-    public function get_original_payment_id( $context = 'view' ) {
-        return $this->get_parent_invoice_id( $context );
+    public function get_original_payment_id($context = 'view') {
+        return $this->get_parent_invoice_id($context);
     }
 
 	/**
@@ -252,8 +252,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WPInv_Invoice
 	 */
-	public function get_parent_invoice( $context = 'view' ) {
-		return new WPInv_Invoice( $this->get_parent_invoice_id( $context ) );
+	public function get_parent_invoice($context = 'view') {
+		return new WPInv_Invoice($this->get_parent_invoice_id($context));
 	}
 
 	/**
@@ -263,8 +263,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WPInv_Invoice
 	 */
-    public function get_parent_payment( $context = 'view' ) {
-        return $this->get_parent_invoice( $context );
+    public function get_parent_payment($context = 'view') {
+        return $this->get_parent_invoice($context);
 	}
 
 	/**
@@ -274,8 +274,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_product_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'product_id', $context );
+	public function get_product_id($context = 'view') {
+		return (int) $this->get_prop('product_id', $context);
 	}
 
 	/**
@@ -285,8 +285,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WPInv_Item
 	 */
-	public function get_product( $context = 'view' ) {
-		return new WPInv_Item( $this->get_product_id( $context ) );
+	public function get_product($context = 'view') {
+		return new WPInv_Item($this->get_product_id($context));
 	}
 
 	/**
@@ -298,8 +298,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_gateway( $context = 'view' ) {
-		return $this->get_parent_invoice( $context )->get_gateway();
+	public function get_gateway($context = 'view') {
+		return $this->get_parent_invoice($context)->get_gateway();
 	}
 
 	/**
@@ -309,8 +309,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_period( $context = 'view' ) {
-		return $this->get_prop( 'period', $context );
+	public function get_period($context = 'view') {
+		return $this->get_prop('period', $context);
 	}
 
 	/**
@@ -320,8 +320,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_frequency( $context = 'view' ) {
-		return (int) $this->get_prop( 'frequency', $context );
+	public function get_frequency($context = 'view') {
+		return (int) $this->get_prop('frequency', $context);
 	}
 
 	/**
@@ -331,8 +331,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_initial_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'initial_amount', $context ) );
+	public function get_initial_amount($context = 'view') {
+		return (float) wpinv_sanitize_amount($this->get_prop('initial_amount', $context));
 	}
 
 	/**
@@ -342,8 +342,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_recurring_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'recurring_amount', $context ) );
+	public function get_recurring_amount($context = 'view') {
+		return (float) wpinv_sanitize_amount($this->get_prop('recurring_amount', $context));
 	}
 
 	/**
@@ -353,8 +353,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_bill_times( $context = 'view' ) {
-		return (int) $this->get_prop( 'bill_times', $context );
+	public function get_bill_times($context = 'view') {
+		return (int) $this->get_prop('bill_times', $context);
 	}
 
 	/**
@@ -364,8 +364,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_transaction_id( $context = 'view' ) {
-		return $this->get_prop( 'transaction_id', $context );
+	public function get_transaction_id($context = 'view') {
+		return $this->get_prop('transaction_id', $context);
 	}
 
 	/**
@@ -375,8 +375,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_created( $context = 'view' ) {
-		return $this->get_prop( 'created', $context );
+	public function get_created($context = 'view') {
+		return $this->get_prop('created', $context);
 	}
 
 	/**
@@ -386,8 +386,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_created( $context );
+	public function get_date_created($context = 'view') {
+		return $this->get_created($context);
 	}
 
 	/**
@@ -398,7 +398,7 @@ 
 	 */
 	public function get_time_created() {
 		$created = $this->get_date_created();
-		return empty( $created ) ? current_time( 'timestamp' ) : strtotime( $created, current_time( 'timestamp' ) );
+		return empty($created) ? current_time('timestamp') : strtotime($created, current_time('timestamp'));
 	}
 
 	/**
@@ -408,11 +408,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created_gmt( $context = 'view' ) {
-        $date = $this->get_date_created( $context );
+	public function get_date_created_gmt($context = 'view') {
+        $date = $this->get_date_created($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
 	}
@@ -424,8 +424,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_next_renewal_date( $context = 'view' ) {
-		return $this->get_prop( 'expiration', $context );
+	public function get_next_renewal_date($context = 'view') {
+		return $this->get_prop('expiration', $context);
 	}
 
 	/**
@@ -435,8 +435,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_expiration( $context = 'view' ) {
-		return $this->get_next_renewal_date( $context );
+	public function get_expiration($context = 'view') {
+		return $this->get_next_renewal_date($context);
 	}
 
 	/**
@@ -448,12 +448,12 @@ 
 	public function get_expiration_time() {
 		$expiration = $this->get_expiration();
 
-		if ( empty( $expiration ) || '0000-00-00 00:00:00' == $expiration ) {
-			return current_time( 'timestamp' );
+		if (empty($expiration) || '0000-00-00 00:00:00' == $expiration) {
+			return current_time('timestamp');
 		}
 
-		$expiration = strtotime( $expiration, current_time( 'timestamp' ) );
-		return $expiration < current_time( 'timestamp' ) ? current_time( 'timestamp' ) : $expiration;
+		$expiration = strtotime($expiration, current_time('timestamp'));
+		return $expiration < current_time('timestamp') ? current_time('timestamp') : $expiration;
 	}
 
 	/**
@@ -463,11 +463,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_next_renewal_date_gmt( $context = 'view' ) {
-        $date = $this->get_next_renewal_date( $context );
+	public function get_next_renewal_date_gmt($context = 'view') {
+        $date = $this->get_next_renewal_date($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
 	}
@@ -479,8 +479,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_trial_period( $context = 'view' ) {
-		return $this->get_prop( 'trial_period', $context );
+	public function get_trial_period($context = 'view') {
+		return $this->get_prop('trial_period', $context);
 	}
 
 	/**
@@ -490,8 +490,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+	public function get_status($context = 'view') {
+		return $this->get_prop('status', $context);
 	}
 
 	/**
@@ -501,8 +501,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_profile_id( $context = 'view' ) {
-		return $this->get_prop( 'profile_id', $context );
+	public function get_profile_id($context = 'view') {
+		return $this->get_prop('profile_id', $context);
 	}
 
 	/*
@@ -517,8 +517,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The customer's id.
 	 */
-	public function set_customer_id( $value ) {
-		$this->set_prop( 'customer_id', (int) $value );
+	public function set_customer_id($value) {
+		$this->set_prop('customer_id', (int) $value);
 	}
 
 	/**
@@ -527,8 +527,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The parent invoice id.
 	 */
-	public function set_parent_invoice_id( $value ) {
-		$this->set_prop( 'parent_payment_id', (int) $value );
+	public function set_parent_invoice_id($value) {
+		$this->set_prop('parent_payment_id', (int) $value);
 	}
 
 	/**
@@ -537,8 +537,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The parent invoice id.
 	 */
-    public function set_parent_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
+    public function set_parent_payment_id($value) {
+        $this->set_parent_invoice_id($value);
 	}
 
 	/**
@@ -547,8 +547,8 @@ 
      * @since 1.0.19
 	 * @param  int $value The parent invoice id.
      */
-    public function set_original_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
+    public function set_original_payment_id($value) {
+        $this->set_parent_invoice_id($value);
 	}
 
 	/**
@@ -557,8 +557,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The subscription product id.
 	 */
-	public function set_product_id( $value ) {
-		$this->set_prop( 'product_id', (int) $value );
+	public function set_product_id($value) {
+		$this->set_prop('product_id', (int) $value);
 	}
 
 	/**
@@ -567,8 +567,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value The renewal period.
 	 */
-	public function set_period( $value ) {
-		$this->set_prop( 'period', $value );
+	public function set_period($value) {
+		$this->set_prop('period', $value);
 	}
 
 	/**
@@ -577,9 +577,9 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The subscription frequency.
 	 */
-	public function set_frequency( $value ) {
-		$value = empty( $value ) ? 1 : (int) $value;
-		$this->set_prop( 'frequency', absint( $value ) );
+	public function set_frequency($value) {
+		$value = empty($value) ? 1 : (int) $value;
+		$this->set_prop('frequency', absint($value));
 	}
 
 	/**
@@ -588,8 +588,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value The initial subcription amount.
 	 */
-	public function set_initial_amount( $value ) {
-		$this->set_prop( 'initial_amount', wpinv_sanitize_amount( $value ) );
+	public function set_initial_amount($value) {
+		$this->set_prop('initial_amount', wpinv_sanitize_amount($value));
 	}
 
 	/**
@@ -598,8 +598,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value The recurring subcription amount.
 	 */
-	public function set_recurring_amount( $value ) {
-		$this->set_prop( 'recurring_amount', wpinv_sanitize_amount( $value ) );
+	public function set_recurring_amount($value) {
+		$this->set_prop('recurring_amount', wpinv_sanitize_amount($value));
 	}
 
 	/**
@@ -608,8 +608,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value Bill times.
 	 */
-	public function set_bill_times( $value ) {
-		$this->set_prop( 'bill_times', (int) $value );
+	public function set_bill_times($value) {
+		$this->set_prop('bill_times', (int) $value);
 	}
 
 	/**
@@ -618,8 +618,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value Bill times.
 	 */
-	public function set_transaction_id( $value ) {
-		$this->set_prop( 'transaction_id', sanitize_text_field( $value ) );
+	public function set_transaction_id($value) {
+		$this->set_prop('transaction_id', sanitize_text_field($value));
 	}
 
 	/**
@@ -628,15 +628,15 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_created( $value ) {
-        $date = strtotime( $value );
+	public function set_created($value) {
+        $date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'created', gmdate( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('created', gmdate('Y-m-d H:i:s', $date));
             return;
         }
 
-		$this->set_prop( 'created', '' );
+		$this->set_prop('created', '');
 
 	}
 
@@ -646,8 +646,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_date_created( $value ) {
-		$this->set_created( $value );
+	public function set_date_created($value) {
+		$this->set_created($value);
     }
 
 	/**
@@ -656,15 +656,15 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_next_renewal_date( $value ) {
-		$date = strtotime( $value );
+	public function set_next_renewal_date($value) {
+		$date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'expiration', gmdate( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('expiration', gmdate('Y-m-d H:i:s', $date));
             return;
 		}
 
-		$this->set_prop( 'expiration', '' );
+		$this->set_prop('expiration', '');
 
 	}
 
@@ -674,8 +674,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_expiration( $value ) {
-		$this->set_next_renewal_date( $value );
+	public function set_expiration($value) {
+		$this->set_next_renewal_date($value);
     }
 
 	/**
@@ -684,8 +684,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value trial period e.g 1 year.
 	 */
-	public function set_trial_period( $value ) {
-		$this->set_prop( 'trial_period', $value );
+	public function set_trial_period($value) {
+		$this->set_prop('trial_period', $value);
 	}
 
 	/**
@@ -694,22 +694,22 @@ 
 	 * @since 1.0.19
 	 * @param string $new_status    New subscription status.
 	 */
-	public function set_status( $new_status ) {
+	public function set_status($new_status) {
 
 		// Abort if this is not a valid status;
-		if ( ! array_key_exists( $new_status, getpaid_get_subscription_statuses() ) ) {
+		if (!array_key_exists($new_status, getpaid_get_subscription_statuses())) {
 			return;
 		}
 
-		$old_status = ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $this->get_status();
-		if ( true === $this->object_read && $old_status !== $new_status ) {
+		$old_status = !empty($this->status_transition['from']) ? $this->status_transition['from'] : $this->get_status();
+		if (true === $this->object_read && $old_status !== $new_status) {
 			$this->status_transition = array(
 				'from' => $old_status,
 				'to'   => $new_status,
 			);
 		}
 
-		$this->set_prop( 'status', $new_status );
+		$this->set_prop('status', $new_status);
 	}
 
 	/**
@@ -718,8 +718,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value the remote profile id.
 	 */
-	public function set_profile_id( $value ) {
-		$this->set_prop( 'profile_id', sanitize_text_field( $value ) );
+	public function set_profile_id($value) {
+		$this->set_prop('profile_id', sanitize_text_field($value));
 	}
 
 	/*
@@ -737,8 +737,8 @@ 
 	 * @param string|array String or array of strings to check for.
 	 * @return bool
      */
-    public function has_status( $status ) {
-        return in_array( $this->get_status(), wpinv_clean( wpinv_parse_list( $status ) ) );
+    public function has_status($status) {
+        return in_array($this->get_status(), wpinv_clean(wpinv_parse_list($status)));
 	}
 
 	/**
@@ -748,7 +748,7 @@ 
      */
     public function has_trial_period() {
 		$period = $this->get_trial_period();
-        return ! empty( $period );
+        return !empty($period);
 	}
 
 	/**
@@ -757,7 +757,7 @@ 
 	 * @return bool
 	 */
 	public function is_active() {
-		return $this->has_status( 'active trialling' ) && ! $this->is_expired();
+		return $this->has_status('active trialling') && !$this->is_expired();
 	}
 
 	/**
@@ -766,7 +766,7 @@ 
 	 * @return bool
 	 */
 	public function is_expired() {
-		return $this->has_status( 'expired' ) || ( $this->has_status( 'active cancelled trialling' ) && $this->get_expiration_time() < current_time( 'timestamp' ) );
+		return $this->has_status('expired') || ($this->has_status('active cancelled trialling') && $this->get_expiration_time() < current_time('timestamp'));
 	}
 
 	/**
@@ -776,7 +776,7 @@ 
 	 */
 	public function is_last_renewal() {
 		$max_bills = $this->get_bill_times();
-		return ! empty( $max_bills ) && $max_bills <= $this->get_times_billed();
+		return !empty($max_bills) && $max_bills <= $this->get_times_billed();
 	}
 
 	/*
@@ -791,11 +791,11 @@ 
 	/**
 	 * Backwards compatibilty.
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
 		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
+		if (is_array($data)) {
+			$this->set_props($data);
 		}
 
 		// Save the item.
@@ -806,8 +806,8 @@ 
 	/**
 	 * Backwards compatibilty.
 	 */
-	public function update( $args = array() ) {
-		return $this->create( $args );
+	public function update($args = array()) {
+		return $this->create($args);
 	}
 
     /**
@@ -816,12 +816,12 @@ 
      * @since  1.0.0
      * @return WP_Post[]
      */
-    public function get_child_payments( $hide_pending = true ) {
+    public function get_child_payments($hide_pending = true) {
 
-		$statuses = array( 'publish', 'wpi-processing', 'wpi-renewal' );
+		$statuses = array('publish', 'wpi-processing', 'wpi-renewal');
 
-		if ( ! $hide_pending ) {
-			$statuses = array_keys( wpinv_get_invoice_statuses() );
+		if (!$hide_pending) {
+			$statuses = array_keys(wpinv_get_invoice_statuses());
 		}
 
         return get_posts(
@@ -843,7 +843,7 @@ 
      * @return int
      */
     public function get_total_payments() {
-		return getpaid_count_subscription_invoices( $this->get_parent_invoice_id(), $this->get_id() );
+		return getpaid_count_subscription_invoices($this->get_parent_invoice_id(), $this->get_id());
     }
 
     /**
@@ -855,7 +855,7 @@ 
     public function get_times_billed() {
         $times_billed = $this->get_total_payments();
 
-        if ( (float) $this->get_initial_amount() == 0 && $times_billed > 0 ) {
+        if ((float) $this->get_initial_amount() == 0 && $times_billed > 0) {
             $times_billed--;
         }
 
@@ -870,47 +870,47 @@ 
 	 * @param  WPInv_Invoice $invoice If adding an existing invoice.
      * @return bool
      */
-    public function add_payment( $args = array(), $invoice = false ) {
+    public function add_payment($args = array(), $invoice = false) {
 
 		// Process each payment once.
-        if ( ! empty( $args['transaction_id'] ) && $this->payment_exists( $args['transaction_id'] ) ) {
+        if (!empty($args['transaction_id']) && $this->payment_exists($args['transaction_id'])) {
             return false;
         }
 
 		// Are we creating a new invoice?
-		if ( empty( $invoice ) ) {
-			$invoice = $this->create_payment( false );
+		if (empty($invoice)) {
+			$invoice = $this->create_payment(false);
 
-			if ( empty( $invoice ) ) {
+			if (empty($invoice)) {
 				return false;
 			}
 		}
 
 		// Maybe set a transaction id.
-		if ( ! empty( $args['transaction_id'] ) ) {
-			$invoice->set_transaction_id( $args['transaction_id'] );
+		if (!empty($args['transaction_id'])) {
+			$invoice->set_transaction_id($args['transaction_id']);
 		}
 
 		// Set the completed date.
-		$invoice->set_completed_date( current_time( 'mysql' ) );
+		$invoice->set_completed_date(current_time('mysql'));
 
 		// And the gateway.
-		if ( ! empty( $args['gateway'] ) ) {
-			$invoice->set_gateway( $args['gateway'] );
+		if (!empty($args['gateway'])) {
+			$invoice->set_gateway($args['gateway']);
 		}
 
-		$invoice->set_status( 'wpi-renewal' );
+		$invoice->set_status('wpi-renewal');
 		$invoice->save();
 
-		if ( ! $invoice->exists() ) {
+		if (!$invoice->exists()) {
 			return false;
 		}
 
-		do_action( 'getpaid_after_create_subscription_renewal_invoice', $invoice, $this );
-		do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
-        do_action( 'wpinv_recurring_record_payment', $invoice->get_id(), $this->get_parent_invoice_id(), $invoice->get_recurring_total(), $invoice->get_transaction_id() );
+		do_action('getpaid_after_create_subscription_renewal_invoice', $invoice, $this);
+		do_action('wpinv_recurring_add_subscription_payment', $invoice, $this);
+        do_action('wpinv_recurring_record_payment', $invoice->get_id(), $this->get_parent_invoice_id(), $invoice->get_recurring_total(), $invoice->get_transaction_id());
 
-        update_post_meta( $invoice->get_id(), '_wpinv_subscription_id', $this->id );
+        update_post_meta($invoice->get_id(), '_wpinv_subscription_id', $this->id);
 
         return $invoice->get_id();
 	}
@@ -922,47 +922,47 @@ 
 	 * @param bool $save Whether we should save the invoice.
      * @return WPInv_Invoice|bool
      */
-    public function create_payment( $save = true ) {
+    public function create_payment($save = true) {
 
 		$parent_invoice = $this->get_parent_payment();
 
-		if ( ! $parent_invoice->exists() ) {
+		if (!$parent_invoice->exists()) {
 			return false;
 		}
 
 		// Duplicate the parent invoice.
-		$invoice = getpaid_duplicate_invoice( $parent_invoice );
-		$invoice->set_parent_id( $parent_invoice->get_id() );
-		$invoice->set_subscription_id( $this->get_id() );
-		$invoice->set_remote_subscription_id( $this->get_profile_id() );
+		$invoice = getpaid_duplicate_invoice($parent_invoice);
+		$invoice->set_parent_id($parent_invoice->get_id());
+		$invoice->set_subscription_id($this->get_id());
+		$invoice->set_remote_subscription_id($this->get_profile_id());
 
 		// Set invoice items.
-		$subscription_group = getpaid_get_invoice_subscription_group( $parent_invoice->get_id(), $this->get_id() );
-		$allowed_items      = empty( $subscription_group ) ? array( $this->get_product_id() ) : array_keys( $subscription_group['items'] );
+		$subscription_group = getpaid_get_invoice_subscription_group($parent_invoice->get_id(), $this->get_id());
+		$allowed_items      = empty($subscription_group) ? array($this->get_product_id()) : array_keys($subscription_group['items']);
 		$invoice_items      = array();
 
-		foreach ( $invoice->get_items() as $item ) {
-			if ( in_array( $item->get_id(), $allowed_items ) ) {
+		foreach ($invoice->get_items() as $item) {
+			if (in_array($item->get_id(), $allowed_items)) {
 				$invoice_items[] = $item;
 			}
 		}
 
-		$invoice->set_items( $invoice_items );
+		$invoice->set_items($invoice_items);
 
-		if ( ! empty( $subscription_group['fees'] ) ) {
-			$invoice->set_fees( $subscription_group['fees'] );
+		if (!empty($subscription_group['fees'])) {
+			$invoice->set_fees($subscription_group['fees']);
 		}
 
 		// Maybe recalculate discount (Pre-GetPaid Fix).
-		$discount = new WPInv_Discount( $invoice->get_discount_code() );
-		if ( $discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount() ) {
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+		$discount = new WPInv_Discount($invoice->get_discount_code());
+		if ($discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount()) {
+			$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 		}
 
 		$invoice->recalculate_total();
-		$invoice->set_status( 'wpi-pending' );
+		$invoice->set_status('wpi-pending');
 
-		if ( ! $save ) {
+		if (!$save) {
 			return $invoice;
 		}
 
@@ -977,24 +977,24 @@ 
 	 * @since  1.0.0
 	 * @return int The subscription's id
 	 */
-	public function renew( $calculate_from = null ) {
+	public function renew($calculate_from = null) {
 
 		// Complete subscription if applicable
-		if ( $this->is_last_renewal() ) {
+		if ($this->is_last_renewal()) {
 			return $this->complete();
 		}
 
 		// Calculate new expiration
 		$frequency      = $this->get_frequency();
 		$period         = $this->get_period();
-		$calculate_from = empty( $calculate_from ) ? $this->get_expiration_time() : $calculate_from;
-		$new_expiration = strtotime( "+ $frequency $period", $calculate_from );
+		$calculate_from = empty($calculate_from) ? $this->get_expiration_time() : $calculate_from;
+		$new_expiration = strtotime("+ $frequency $period", $calculate_from);
 
-		$this->set_expiration( date( 'Y-m-d H:i:s', $new_expiration ) );
-		$this->set_status( 'active' );
+		$this->set_expiration(date('Y-m-d H:i:s', $new_expiration));
+		$this->set_status('active');
 		$this->save();
 
-		do_action( 'getpaid_subscription_renewed', $this );
+		do_action('getpaid_subscription_renewed', $this);
 
 		return $this->get_id();
 	}
@@ -1010,11 +1010,11 @@ 
 	public function complete() {
 
 		// Only mark a subscription as complete if it's not already cancelled.
-		if ( $this->has_status( 'cancelled' ) ) {
+		if ($this->has_status('cancelled')) {
 			return false;
 		}
 
-		$this->set_status( 'completed' );
+		$this->set_status('completed');
 		return $this->save();
 
 	}
@@ -1026,14 +1026,14 @@ 
 	 * @param  bool $check_expiration
 	 * @return int|bool Subscription id or false if $check_expiration is true and expiration date is in the future.
 	 */
-	public function expire( $check_expiration = false ) {
+	public function expire($check_expiration = false) {
 
-		if ( $check_expiration && $this->get_expiration_time() > current_time( 'timestamp' ) ) {
+		if ($check_expiration && $this->get_expiration_time() > current_time('timestamp')) {
 			// Do not mark as expired since real expiration date is in the future
 			return false;
 		}
 
-		$this->set_status( 'expired' );
+		$this->set_status('expired');
 		return $this->save();
 
 	}
@@ -1045,7 +1045,7 @@ 
 	 * @return int Subscription id.
 	 */
 	public function failing() {
-		$this->set_status( 'failing' );
+		$this->set_status('failing');
 		return $this->save();
 	}
 
@@ -1056,7 +1056,7 @@ 
      * @return int Subscription id.
      */
     public function cancel() {
-		$this->set_status( 'cancelled' );
+		$this->set_status('cancelled');
 		return $this->save();
     }
 
@@ -1067,7 +1067,7 @@ 
 	 * @return bool
 	 */
 	public function can_cancel() {
-		return apply_filters( 'wpinv_subscription_can_cancel', $this->has_status( $this->get_cancellable_statuses() ), $this );
+		return apply_filters('wpinv_subscription_can_cancel', $this->has_status($this->get_cancellable_statuses()), $this);
 	}
 
     /**
@@ -1078,7 +1078,7 @@ 
      * @return      array
      */
     public function get_cancellable_statuses() {
-        return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
+        return apply_filters('wpinv_recurring_cancellable_statuses', array('active', 'trialling', 'failing'));
     }
 
 	/**
@@ -1088,8 +1088,8 @@ 
 	 * @return string
 	 */
 	public function get_cancel_url() {
-		$url = getpaid_get_authenticated_action_url( 'subscription_cancel', $this->get_view_url() );
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+		$url = getpaid_get_authenticated_action_url('subscription_cancel', $this->get_view_url());
+		return apply_filters('wpinv_subscription_cancel_url', $url, $this);
 	}
 
 	/**
@@ -1100,10 +1100,10 @@ 
 	 */
 	public function get_view_url() {
 
-		$url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$url = add_query_arg( 'subscription', $this->get_id(), $url );
+		$url = getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')));
+		$url = add_query_arg('subscription', $this->get_id(), $url);
 
-		return apply_filters( 'getpaid_get_subscription_view_url', $url, $this );
+		return apply_filters('getpaid_get_subscription_view_url', $url, $this);
 	}
 
 	/**
@@ -1116,7 +1116,7 @@ 
 	 * @return bool
 	 */
 	public function can_renew() {
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+		return apply_filters('wpinv_subscription_can_renew', true, $this);
 	}
 
 	/**
@@ -1135,7 +1135,7 @@ 
             ),
             'getpaid-nonce'
         );
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+		return apply_filters('wpinv_subscription_renew_url', $url, $this);
 	}
 
 	/**
@@ -1145,7 +1145,7 @@ 
 	 * @return bool
 	 */
 	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
+		return apply_filters('wpinv_subscription_can_update', false, $this);
 	}
 
 	/**
@@ -1161,7 +1161,7 @@ 
 				'subscription_id' => $this->get_id(),
             )
         );
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+		return apply_filters('wpinv_subscription_update_url', $url, $this);
 	}
 
 	/**
@@ -1171,7 +1171,7 @@ 
 	 * @return string
 	 */
 	public function get_status_label() {
-		return getpaid_get_subscription_status_label( $this->get_status() );
+		return getpaid_get_subscription_status_label($this->get_status());
 	}
 
 	/**
@@ -1182,7 +1182,7 @@ 
 	 */
 	public function get_status_class() {
 		$statuses = getpaid_get_subscription_status_classes();
-		return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'bg-dark';
+		return isset($statuses[$this->get_status()]) ? $statuses[$this->get_status()] : 'bg-dark';
 	}
 
     /**
@@ -1193,9 +1193,9 @@ 
      */
     public function get_status_label_html() {
 
-		$status_label = sanitize_text_field( $this->get_status_label() );
-		$class        = esc_attr( $this->get_status_class() );
-		$status       = sanitize_html_class( $this->get_status() );
+		$status_label = sanitize_text_field($this->get_status_label());
+		$class        = esc_attr($this->get_status_class());
+		$status       = sanitize_html_class($this->get_status());
 
 		return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
     }
@@ -1207,9 +1207,9 @@ 
      * @param  string $txn_id The transaction ID from the merchant processor
      * @return bool
      */
-    public function payment_exists( $txn_id = '' ) {
-		$invoice_id = WPInv_Invoice::get_invoice_id_by_field( $txn_id, 'transaction_id' );
-        return ! empty( $invoice_id );
+    public function payment_exists($txn_id = '') {
+		$invoice_id = WPInv_Invoice::get_invoice_id_by_field($txn_id, 'transaction_id');
+        return !empty($invoice_id);
 	}
 
 	/**
@@ -1221,35 +1221,35 @@ 
 		// Reset status transition variable.
 		$this->status_transition = false;
 
-		if ( $status_transition ) {
+		if ($status_transition) {
 			try {
 
 				// Fire a hook for the status change.
-				do_action( 'wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition );
-				do_action( 'getpaid_subscription_' . $status_transition['to'], $this, $status_transition );
+				do_action('wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition);
+				do_action('getpaid_subscription_' . $status_transition['to'], $this, $status_transition);
 
-				if ( ! empty( $status_transition['from'] ) ) {
+				if (!empty($status_transition['from'])) {
 
 					/* translators: 1: old subscription status 2: new subscription status */
-					$transition_note = sprintf( __( 'Subscription status changed from %1$s to %2$s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['from'] ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+					$transition_note = sprintf(__('Subscription status changed from %1$s to %2$s.', 'invoicing'), getpaid_get_subscription_status_label($status_transition['from']), getpaid_get_subscription_status_label($status_transition['to']));
 
 					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
+					$this->get_parent_payment()->add_note($transition_note, false, false, true);
 
 					// Fire another hook.
-					do_action( 'getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this );
-					do_action( 'getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to'] );
+					do_action('getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this);
+					do_action('getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to']);
 
 				} else {
 					/* translators: %s: new invoice status */
-					$transition_note = sprintf( __( 'Subscription status set to %s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+					$transition_note = sprintf(__('Subscription status set to %s.', 'invoicing'), getpaid_get_subscription_status_label($status_transition['to']));
 
 					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
+					$this->get_parent_payment()->add_note($transition_note, false, false, true);
 
 				}
-			} catch ( Exception $e ) {
-				$this->get_parent_payment()->add_note( __( 'Error during subscription status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
+			} catch (Exception $e) {
+				$this->get_parent_payment()->add_note(__('Error during subscription status transition.', 'invoicing') . ' ' . $e->getMessage());
 			}
 		}
 
@@ -1275,7 +1275,7 @@ 
 	 */
 	public function activate() {
 		$status = $this->has_trial_period() && 'trialling' === $this->get_status() ? 'trialling' : 'active';
-		$this->set_status( $status );
+		$this->set_status($status);
 		return $this->save();
 	}
 

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

Indentation +232 added lines, -232 removed lines

@@ -13,58 +13,58 @@ 
 class GetPaid_Authorize_Net_Gateway extends GetPaid_Authorize_Net_Legacy_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'authorizenet';
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array( 'subscription', 'sandbox', 'tokens', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change' );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
+     * Payment method order.
+     *
+     * @var int
+     */
     public $order = 4;
 
     /**
-	 * Endpoint for requests from Authorize.net.
-	 *
-	 * @var string
-	 */
-	protected $notify_url;
-
-	/**
-	 * Endpoint for requests to Authorize.net.
-	 *
-	 * @var string
-	 */
+     * Endpoint for requests from Authorize.net.
+     *
+     * @var string
+     */
+    protected $notify_url;
+
+    /**
+     * Endpoint for requests to Authorize.net.
+     *
+     * @var string
+     */
     protected $endpoint;
 
     /**
-	 * Currencies this gateway is allowed for.
-	 *
-	 * @var array
-	 */
-	public $currencies = array( 'USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD' );
+     * Currencies this gateway is allowed for.
+     *
+     * @var array
+     */
+    public $currencies = array( 'USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD' );
 
     /**
-	 * URL to view a transaction.
-	 *
-	 * @var string
-	 */
+     * URL to view a transaction.
+     *
+     * @var string
+     */
     public $view_transaction_url = 'https://{sandbox}authorize.net/ui/themes/sandbox/Transaction/TransactionReceipt.aspx?transid=%s';
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
 
         $this->title                = __( 'Credit Card / Debit Card', 'invoicing' );
         $this->method_title         = __( 'Authorize.Net', 'invoicing' );
@@ -76,11 +76,11 @@ 
     }
 
     /**
-	 * Displays the payment method select field.
-	 *
-	 * @param int $invoice_id 0 or invoice id.
-	 * @param GetPaid_Payment_Form $form Current payment form.
-	 */
+     * Displays the payment method select field.
+     *
+     * @param int $invoice_id 0 or invoice id.
+     * @param GetPaid_Payment_Form $form Current payment form.
+     */
     public function payment_fields( $invoice_id, $form ) {
 
         // Let the user select a payment method.
@@ -91,16 +91,16 @@ 
     }
 
     /**
-	 * Creates a customer profile.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
+     * Creates a customer profile.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
      * @param array $submission_data Posted checkout fields.
      * @param bool $save Whether or not to save the payment as a token.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
-	 * @return string|WP_Error Payment profile id.
-	 */
-	public function create_customer_profile( $invoice, $submission_data, $save = true ) {
+     * @return string|WP_Error Payment profile id.
+     */
+    public function create_customer_profile( $invoice, $submission_data, $save = true ) {
 
         // Remove non-digits from the number
         $submission_data['authorizenet']['cc_number'] = preg_replace( '/\D/', '', $submission_data['authorizenet']['cc_number'] );
@@ -182,14 +182,14 @@ 
     }
 
     /**
-	 * Retrieves a customer profile.
-	 *
-	 *
-	 * @param string $profile_id profile id.
-	 * @return string|WP_Error Profile id.
+     * Retrieves a customer profile.
+     *
+     *
+     * @param string $profile_id profile id.
+     * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-profile
-	 */
-	public function get_customer_profile( $profile_id ) {
+     */
+    public function get_customer_profile( $profile_id ) {
 
         // Generate args.
         $args = array(
@@ -204,17 +204,17 @@ 
     }
 
     /**
-	 * Creates a customer profile.
-	 *
-	 *
+     * Creates a customer profile.
+     *
+     *
      * @param string $profile_id profile id.
-	 * @param WPInv_Invoice $invoice Invoice.
+     * @param WPInv_Invoice $invoice Invoice.
      * @param array $submission_data Posted checkout fields.
      * @param bool $save Whether or not to save the payment as a token.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
-	 * @return string|WP_Error Profile id.
-	 */
-	public function create_customer_payment_profile( $customer_profile, $invoice, $submission_data, $save ) {
+     * @return string|WP_Error Profile id.
+     */
+    public function create_customer_payment_profile( $customer_profile, $invoice, $submission_data, $save ) {
 
         // Remove non-digits from the number
         $submission_data['authorizenet']['cc_number'] = preg_replace( '/\D/', '', $submission_data['authorizenet']['cc_number'] );
@@ -302,13 +302,13 @@ 
     }
 
     /**
-	 * Retrieves payment details from cache.
-	 *
-	 *
+     * Retrieves payment details from cache.
+     *
+     *
      * @param array $payment_details.
-	 * @return array|false Profile id.
-	 */
-	public function retrieve_payment_profile_from_cache( $payment_details, $customer_profile, $invoice ) {
+     * @return array|false Profile id.
+     */
+    public function retrieve_payment_profile_from_cache( $payment_details, $customer_profile, $invoice ) {
 
         $cached_information = get_option( 'getpaid_authorize_net_cached_profiles', array() );
         $payment_details    = hash_hmac( 'sha256', json_encode( $payment_details ), SECURE_AUTH_KEY );
@@ -333,13 +333,13 @@ 
     }
 
     /**
-	 * Securely adds payment details to cache.
-	 *
-	 *
+     * Securely adds payment details to cache.
+     *
+     *
      * @param array $payment_details.
      * @param string $payment_profile_id.
-	 */
-	public function add_payment_profile_to_cache( $payment_details, $payment_profile_id ) {
+     */
+    public function add_payment_profile_to_cache( $payment_details, $payment_profile_id ) {
 
         $cached_information = get_option( 'getpaid_authorize_net_cached_profiles', array() );
         $cached_information = is_array( $cached_information ) ? $cached_information : array();
@@ -351,15 +351,15 @@ 
     }
 
     /**
-	 * Retrieves a customer payment profile.
-	 *
-	 *
-	 * @param string $customer_profile_id customer profile id.
+     * Retrieves a customer payment profile.
+     *
+     *
+     * @param string $customer_profile_id customer profile id.
      * @param string $payment_profile_id payment profile id.
-	 * @return string|WP_Error Profile id.
+     * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-payment-profile
-	 */
-	public function get_customer_payment_profile( $customer_profile_id, $payment_profile_id ) {
+     */
+    public function get_customer_payment_profile( $customer_profile_id, $payment_profile_id ) {
 
         // Generate args.
         $args = array(
@@ -375,15 +375,15 @@ 
     }
 
     /**
-	 * Charges a customer payment profile.
-	 *
+     * Charges a customer payment profile.
+     *
      * @param string $customer_profile_id customer profile id.
      * @param string $payment_profile_id payment profile id.
-	 * @param WPInv_Invoice $invoice Invoice.
+     * @param WPInv_Invoice $invoice Invoice.
      * @link https://developer.authorize.net/api/reference/index.html#payment-transactions-charge-a-customer-profile
-	 * @return WP_Error|object
-	 */
-	public function charge_customer_payment_profile( $customer_profile_id, $payment_profile_id, $invoice ) {
+     * @return WP_Error|object
+     */
+    public function charge_customer_payment_profile( $customer_profile_id, $payment_profile_id, $invoice ) {
 
         // Generate args.
         $args = array(
@@ -429,41 +429,41 @@ 
     }
 
     /**
-	 * Processes a customer charge.
-	 *
+     * Processes a customer charge.
+     *
      * @param stdClass $result Api response.
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function process_charge_response( $result, $invoice ) {
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    public function process_charge_response( $result, $invoice ) {
 
         wpinv_clear_errors();
-		$response_code = (int) $result->transactionResponse->responseCode;
+        $response_code = (int) $result->transactionResponse->responseCode;
 
-		// Succeeded.
-		if ( 1 == $response_code || 4 == $response_code ) {
+        // Succeeded.
+        if ( 1 == $response_code || 4 == $response_code ) {
 
-			// Maybe set a transaction id.
-			if ( ! empty( $result->transactionResponse->transId ) ) {
-				$invoice->set_transaction_id( $result->transactionResponse->transId );
-			}
+            // Maybe set a transaction id.
+            if ( ! empty( $result->transactionResponse->transId ) ) {
+                $invoice->set_transaction_id( $result->transactionResponse->transId );
+            }
 
-			$invoice->add_note( sprintf( __( 'Authentication code: %1$s (%2$s).', 'invoicing' ), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber ), false, false, true );
+            $invoice->add_note( sprintf( __( 'Authentication code: %1$s (%2$s).', 'invoicing' ), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber ), false, false, true );
 
-			if ( 1 == $response_code ) {
-				return $invoice->mark_paid();
-			}
+            if ( 1 == $response_code ) {
+                return $invoice->mark_paid();
+            }
 
-			$invoice->set_status( 'wpi-onhold' );
-        	$invoice->add_note(
+            $invoice->set_status( 'wpi-onhold' );
+            $invoice->add_note(
                 sprintf(
                     __( 'Held for review: %s', 'invoicing' ),
                     $result->transactionResponse->messages->message[0]->description
                 )
-			);
+            );
 
-			return $invoice->save();
+            return $invoice->save();
 
-		}
+        }
 
         wpinv_set_error( 'card_declined' );
 
@@ -475,13 +475,13 @@ 
     }
 
     /**
-	 * Returns payment information.
-	 *
-	 *
-	 * @param array $card Card details.
-	 * @return array
-	 */
-	public function get_payment_information( $card ) {
+     * Returns payment information.
+     *
+     *
+     * @param array $card Card details.
+     * @return array
+     */
+    public function get_payment_information( $card ) {
         return array(
 
             'creditCard' => array(
@@ -494,25 +494,25 @@ 
     }
 
     /**
-	 * Returns the customer profile meta name.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @return string
-	 */
-	public function get_customer_profile_meta_name( $invoice ) {
+     * Returns the customer profile meta name.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @return string
+     */
+    public function get_customer_profile_meta_name( $invoice ) {
         return $this->is_sandbox( $invoice ) ? 'getpaid_authorizenet_sandbox_customer_profile_id' : 'getpaid_authorizenet_customer_profile_id';
     }
 
     /**
-	 * Validates the submitted data.
-	 *
-	 *
-	 * @param array $submission_data Posted checkout fields.
+     * Validates the submitted data.
+     *
+     *
+     * @param array $submission_data Posted checkout fields.
      * @param WPInv_Invoice $invoice
-	 * @return WP_Error|string The payment profile id
-	 */
-	public function validate_submission_data( $submission_data, $invoice ) {
+     * @return WP_Error|string The payment profile id
+     */
+    public function validate_submission_data( $submission_data, $invoice ) {
 
         // Validate authentication details.
         $auth = $this->get_auth_params();
@@ -544,13 +544,13 @@ 
     }
 
     /**
-	 * Returns invoice line items.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @return array
-	 */
-	public function get_line_items( $invoice ) {
+     * Returns invoice line items.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @return array
+     */
+    public function get_line_items( $invoice ) {
         $items = array();
 
         foreach ( $invoice->get_items() as $item ) {
@@ -587,15 +587,15 @@ 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Validate the submitted data.
         $payment_profile_id = $this->validate_submission_data( $submission_data, $invoice );
@@ -628,45 +628,45 @@ 
 
         exit;
 
-	}
+    }
 
-	/**
-	 * Processes the initial payment.
-	 *
+    /**
+     * Processes the initial payment.
+     *
      * @param WPInv_Invoice $invoice Invoice.
-	 */
-	protected function process_initial_payment( $invoice ) {
+     */
+    protected function process_initial_payment( $invoice ) {
 
-		$payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
+        $payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
         $customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
+        $result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
 
-		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
-			wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        // Do we have an error?
+        if ( is_wp_error( $result ) ) {
+            wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-		// Process the response.
-		$this->process_charge_response( $result, $invoice );
+        // Process the response.
+        $this->process_charge_response( $result, $invoice );
 
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        if ( wpinv_get_errors() ) {
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-	}
+    }
 
     /**
-	 * Processes recurring payments.
-	 *
+     * Processes recurring payments.
+     *
      * @param WPInv_Invoice $invoice Invoice.
      * @param WPInv_Subscription[]|WPInv_Subscription $subscriptions Subscriptions.
-	 */
-	public function process_subscription( $invoice, $subscriptions ) {
+     */
+    public function process_subscription( $invoice, $subscriptions ) {
 
         // Check if there is an initial amount to charge.
         if ( (float) $invoice->get_total() > 0 ) {
-			$this->process_initial_payment( $invoice );
+            $this->process_initial_payment( $invoice );
         }
 
         // Activate the subscriptions.
@@ -684,36 +684,36 @@ 
             }
         }
 
-		// Redirect to the success page.
+        // Redirect to the success page.
         wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
 
     }
 
-	/**
-	 * (Maybe) renews an authorize.net subscription profile.
-	 *
-	 *
+    /**
+     * (Maybe) renews an authorize.net subscription profile.
+     *
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
+     */
+    public function maybe_renew_subscription( $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
             $this->renew_subscription( $subscription );
         }
 
-	}
+    }
 
     /**
-	 * Renews a subscription.
-	 *
+     * Renews a subscription.
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function renew_subscription( $subscription ) {
+     */
+    public function renew_subscription( $subscription ) {
 
-		// Generate the renewal invoice.
-		$new_invoice = $subscription->create_payment();
-		$old_invoice = $subscription->get_parent_payment();
+        // Generate the renewal invoice.
+        $new_invoice = $subscription->create_payment();
+        $old_invoice = $subscription->get_parent_payment();
 
         if ( empty( $new_invoice ) ) {
             $old_invoice->add_note( __( 'Error generating a renewal invoice.', 'invoicing' ), false, false, false );
@@ -722,37 +722,37 @@ 
         }
 
         // Charge the payment method.
-		$payment_profile_id = get_post_meta( $old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $old_invoice->get_user_id(), $this->get_customer_profile_meta_name( $old_invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $new_invoice );
-
-		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
-
-			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), $result->get_error_message() ),
-				true,
-				false,
-				true
-			);
-			$subscription->failing();
-			return;
-
-		}
-
-		// Process the response.
-		$this->process_charge_response( $result, $new_invoice );
-
-		if ( wpinv_get_errors() ) {
-
-			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), getpaid_get_errors_html() ),
-				true,
-				false,
-				true
-			);
-			$subscription->failing();
-			return;
+        $payment_profile_id = get_post_meta( $old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
+        $customer_profile   = get_user_meta( $old_invoice->get_user_id(), $this->get_customer_profile_meta_name( $old_invoice ), true );
+        $result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $new_invoice );
+
+        // Do we have an error?
+        if ( is_wp_error( $result ) ) {
+
+            $old_invoice->add_note(
+                sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), $result->get_error_message() ),
+                true,
+                false,
+                true
+            );
+            $subscription->failing();
+            return;
+
+        }
+
+        // Process the response.
+        $this->process_charge_response( $result, $new_invoice );
+
+        if ( wpinv_get_errors() ) {
+
+            $old_invoice->add_note(
+                sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), getpaid_get_errors_html() ),
+                true,
+                false,
+                true
+            );
+            $subscription->failing();
+            return;
 
         }
 
@@ -761,13 +761,13 @@ 
     }
 
     /**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         global $getpaid_authorize_addons;
 
@@ -786,7 +786,7 @@ 
         $invoice->recalculate_total();
 
         $payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
+        $customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
 
         add_filter( 'getpaid_authorizenet_charge_customer_payment_profile_args', array( $this, 'filter_addons_request' ), 10, 2 );
         $result = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
@@ -801,11 +801,11 @@ 
     }
 
     /**
-	 * Processes invoice addons.
-	 *
+     * Processes invoice addons.
+     *
      * @param array $args
-	 * @return array
-	 */
+     * @return array
+     */
     public function filter_addons_request( $args ) {
 
         global $getpaid_authorize_addons;
@@ -839,11 +839,11 @@ 
     }
 
     /**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $currencies = sprintf(
             __( 'Supported Currencies: %s', 'invoicing' ),
@@ -883,7 +883,7 @@ 
             'readonly' => true,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
 }

Spacing +205 added lines, -205 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Authorize.net Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'sandbox', 'tokens', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change' );
+    protected $supports = array('subscription', 'sandbox', 'tokens', 'addons', 'single_subscription_group', 'multiple_subscription_groups', 'subscription_date_change');
 
     /**
 	 * Payment method order.
@@ -52,7 +52,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD' );
+	public $currencies = array('USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD');
 
     /**
 	 * URL to view a transaction.
@@ -66,12 +66,12 @@ 
 	 */
 	public function __construct() {
 
-        $this->title                = __( 'Credit Card / Debit Card', 'invoicing' );
-        $this->method_title         = __( 'Authorize.Net', 'invoicing' );
-        $this->notify_url           = getpaid_get_non_query_string_ipn_url( $this->id );
+        $this->title                = __('Credit Card / Debit Card', 'invoicing');
+        $this->method_title         = __('Authorize.Net', 'invoicing');
+        $this->notify_url           = getpaid_get_non_query_string_ipn_url($this->id);
 
-        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-        add_filter( 'getpaid_authorizenet_sandbox_notice', array( $this, 'sandbox_notice' ) );
+        add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
+        add_filter('getpaid_authorizenet_sandbox_notice', array($this, 'sandbox_notice'));
         parent::__construct();
     }
 
@@ -81,13 +81,13 @@ 
 	 * @param int $invoice_id 0 or invoice id.
 	 * @param GetPaid_Payment_Form $form Current payment form.
 	 */
-    public function payment_fields( $invoice_id, $form ) {
+    public function payment_fields($invoice_id, $form) {
 
         // Let the user select a payment method.
         $this->saved_payment_methods();
 
         // Show the credit card entry form.
-        $this->new_payment_method_entry( $this->get_cc_form( true ) );
+        $this->new_payment_method_entry($this->get_cc_form(true));
     }
 
     /**
@@ -100,79 +100,79 @@ 
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
 	 * @return string|WP_Error Payment profile id.
 	 */
-	public function create_customer_profile( $invoice, $submission_data, $save = true ) {
+	public function create_customer_profile($invoice, $submission_data, $save = true) {
 
         // Remove non-digits from the number
-        $submission_data['authorizenet']['cc_number'] = preg_replace( '/\D/', '', $submission_data['authorizenet']['cc_number'] );
+        $submission_data['authorizenet']['cc_number'] = preg_replace('/\D/', '', $submission_data['authorizenet']['cc_number']);
 
         // Generate args.
         $args = array(
             'createCustomerProfileRequest' => array(
                 'merchantAuthentication' => $this->get_auth_params(),
                 'profile'                => array(
-                    'merchantCustomerId' => getpaid_limit_length( $invoice->get_user_id(), 20 ),
-                    'description'        => getpaid_limit_length( $invoice->get_full_name(), 255 ),
-                    'email'              => getpaid_limit_length( $invoice->get_email(), 255 ),
+                    'merchantCustomerId' => getpaid_limit_length($invoice->get_user_id(), 20),
+                    'description'        => getpaid_limit_length($invoice->get_full_name(), 255),
+                    'email'              => getpaid_limit_length($invoice->get_email(), 255),
                     'paymentProfiles'    => array(
                         'customerType' => 'individual',
 
                         // Billing information.
                         'billTo'       => array(
-                            'firstName' => getpaid_limit_length( $invoice->get_first_name(), 50 ),
-                            'lastName'  => getpaid_limit_length( $invoice->get_last_name(), 50 ),
-                            'address'   => getpaid_limit_length( $invoice->get_address(), 60 ),
-                            'city'      => getpaid_limit_length( $invoice->get_city(), 40 ),
-                            'state'     => getpaid_limit_length( $invoice->get_state(), 40 ),
-                            'zip'       => getpaid_limit_length( $invoice->get_zip(), 20 ),
-                            'country'   => getpaid_limit_length( $invoice->get_country(), 60 ),
+                            'firstName' => getpaid_limit_length($invoice->get_first_name(), 50),
+                            'lastName'  => getpaid_limit_length($invoice->get_last_name(), 50),
+                            'address'   => getpaid_limit_length($invoice->get_address(), 60),
+                            'city'      => getpaid_limit_length($invoice->get_city(), 40),
+                            'state'     => getpaid_limit_length($invoice->get_state(), 40),
+                            'zip'       => getpaid_limit_length($invoice->get_zip(), 20),
+                            'country'   => getpaid_limit_length($invoice->get_country(), 60),
                         ),
 
                         // Payment information.
-                        'payment'      => $this->get_payment_information( $submission_data['authorizenet'] ),
+                        'payment'      => $this->get_payment_information($submission_data['authorizenet']),
                     ),
                 ),
-                'validationMode'         => $this->is_sandbox( $invoice ) ? 'testMode' : 'liveMode',
+                'validationMode'         => $this->is_sandbox($invoice) ? 'testMode' : 'liveMode',
             ),
         );
 
-        $response = $this->post( apply_filters( 'getpaid_authorizenet_customer_profile_args', $args, $invoice ), $invoice );
+        $response = $this->post(apply_filters('getpaid_authorizenet_customer_profile_args', $args, $invoice), $invoice);
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
 
             // In case the payment profile already exists remotely.
-            if ( 'dup_payment_profile' === $response->get_error_code() ) {
-                $customer_profile_id = strtok( $response->get_error_message(), '.' );
-                update_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), $customer_profile_id );
-                return strtok( '.' );
+            if ('dup_payment_profile' === $response->get_error_code()) {
+                $customer_profile_id = strtok($response->get_error_message(), '.');
+                update_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), $customer_profile_id);
+                return strtok('.');
             }
 
             // In case the customer profile already exists remotely.
-            if ( 'E00039' === $response->get_error_code() ) {
-                $customer_profile_id = str_replace( 'A duplicate record with ID ', '', $response->get_error_message() );
-                $customer_profile_id = str_replace( ' already exists.', '', $customer_profile_id );
-                return $this->create_customer_payment_profile( trim( $customer_profile_id ), $invoice, $submission_data, $save );
+            if ('E00039' === $response->get_error_code()) {
+                $customer_profile_id = str_replace('A duplicate record with ID ', '', $response->get_error_message());
+                $customer_profile_id = str_replace(' already exists.', '', $customer_profile_id);
+                return $this->create_customer_payment_profile(trim($customer_profile_id), $invoice, $submission_data, $save);
             }
 
             return $response;
         }
 
-        update_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), $response->customerProfileId );
+        update_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), $response->customerProfileId);
 
         // Save the payment token.
-        if ( $save ) {
+        if ($save) {
             $this->save_token(
                 array(
                     'id'      => $response->customerPaymentProfileIdList[0],
-                    'name'    => getpaid_get_card_name( $submission_data['authorizenet']['cc_number'] ) . '····' . substr( $submission_data['authorizenet']['cc_number'], -4 ),
+                    'name'    => getpaid_get_card_name($submission_data['authorizenet']['cc_number']) . '····' . substr($submission_data['authorizenet']['cc_number'], -4),
                     'default' => true,
-                    'type'    => $this->is_sandbox( $invoice ) ? 'sandbox' : 'live',
+                    'type'    => $this->is_sandbox($invoice) ? 'sandbox' : 'live',
                 )
             );
         }
 
         // Add a note about the validation response.
         $invoice->add_note(
-            sprintf( __( 'Created Authorize.NET customer profile: %s', 'invoicing' ), $response->validationDirectResponseList[0] ),
+            sprintf(__('Created Authorize.NET customer profile: %s', 'invoicing'), $response->validationDirectResponseList[0]),
             false,
             false,
             true
@@ -189,7 +189,7 @@ 
 	 * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-profile
 	 */
-	public function get_customer_profile( $profile_id ) {
+	public function get_customer_profile($profile_id) {
 
         // Generate args.
         $args = array(
@@ -199,7 +199,7 @@ 
             ),
         );
 
-        return $this->post( $args, false );
+        return $this->post($args, false);
 
     }
 
@@ -214,18 +214,18 @@ 
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
 	 * @return string|WP_Error Profile id.
 	 */
-	public function create_customer_payment_profile( $customer_profile, $invoice, $submission_data, $save ) {
+	public function create_customer_payment_profile($customer_profile, $invoice, $submission_data, $save) {
 
         // Remove non-digits from the number
-        $submission_data['authorizenet']['cc_number'] = preg_replace( '/\D/', '', $submission_data['authorizenet']['cc_number'] );
+        $submission_data['authorizenet']['cc_number'] = preg_replace('/\D/', '', $submission_data['authorizenet']['cc_number']);
 
         // Prepare card details.
-        $payment_information                          = $this->get_payment_information( $submission_data['authorizenet'] );
+        $payment_information                          = $this->get_payment_information($submission_data['authorizenet']);
 
         // Authorize.NET does not support saving the same card twice.
-        $cached_information                           = $this->retrieve_payment_profile_from_cache( $payment_information, $customer_profile, $invoice );
+        $cached_information                           = $this->retrieve_payment_profile_from_cache($payment_information, $customer_profile, $invoice);
 
-        if ( $cached_information ) {
+        if ($cached_information) {
             return $cached_information;
         }
 
@@ -238,34 +238,34 @@ 
 
                     // Billing information.
                     'billTo'  => array(
-                        'firstName' => getpaid_limit_length( $invoice->get_first_name(), 50 ),
-                        'lastName'  => getpaid_limit_length( $invoice->get_last_name(), 50 ),
-                        'address'   => getpaid_limit_length( $invoice->get_address(), 60 ),
-                        'city'      => getpaid_limit_length( $invoice->get_city(), 40 ),
-                        'state'     => getpaid_limit_length( $invoice->get_state(), 40 ),
-                        'zip'       => getpaid_limit_length( $invoice->get_zip(), 20 ),
-                        'country'   => getpaid_limit_length( $invoice->get_country(), 60 ),
+                        'firstName' => getpaid_limit_length($invoice->get_first_name(), 50),
+                        'lastName'  => getpaid_limit_length($invoice->get_last_name(), 50),
+                        'address'   => getpaid_limit_length($invoice->get_address(), 60),
+                        'city'      => getpaid_limit_length($invoice->get_city(), 40),
+                        'state'     => getpaid_limit_length($invoice->get_state(), 40),
+                        'zip'       => getpaid_limit_length($invoice->get_zip(), 20),
+                        'country'   => getpaid_limit_length($invoice->get_country(), 60),
                     ),
 
                     // Payment information.
                     'payment' => $payment_information,
                 ),
-                'validationMode'         => $this->is_sandbox( $invoice ) ? 'testMode' : 'liveMode',
+                'validationMode'         => $this->is_sandbox($invoice) ? 'testMode' : 'liveMode',
             ),
         );
 
-        $response = $this->post( apply_filters( 'getpaid_authorizenet_create_customer_payment_profile_args', $args, $invoice ), $invoice );
+        $response = $this->post(apply_filters('getpaid_authorizenet_create_customer_payment_profile_args', $args, $invoice), $invoice);
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
 
             // In case the payment profile already exists remotely.
-            if ( 'dup_payment_profile' == $response->get_error_code() ) {
-                $customer_profile_id = strtok( $response->get_error_message(), '.' );
-                $payment_profile_id  = strtok( '.' );
-                update_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), $customer_profile_id );
+            if ('dup_payment_profile' == $response->get_error_code()) {
+                $customer_profile_id = strtok($response->get_error_message(), '.');
+                $payment_profile_id  = strtok('.');
+                update_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), $customer_profile_id);
 
                 // Cache payment profile id.
-                $this->add_payment_profile_to_cache( $payment_information, $payment_profile_id );
+                $this->add_payment_profile_to_cache($payment_information, $payment_profile_id);
 
                 return $payment_profile_id;
             }
@@ -274,29 +274,29 @@ 
         }
 
         // Save the payment token.
-        if ( $save ) {
+        if ($save) {
             $this->save_token(
                 array(
                     'id'      => $response->customerPaymentProfileId,
-                    'name'    => getpaid_get_card_name( $submission_data['authorizenet']['cc_number'] ) . ' ···· ' . substr( $submission_data['authorizenet']['cc_number'], -4 ),
+                    'name'    => getpaid_get_card_name($submission_data['authorizenet']['cc_number']) . ' ···· ' . substr($submission_data['authorizenet']['cc_number'], -4),
                     'default' => true,
-                    'type'    => $this->is_sandbox( $invoice ) ? 'sandbox' : 'live',
+                    'type'    => $this->is_sandbox($invoice) ? 'sandbox' : 'live',
                 )
             );
         }
 
         // Cache payment profile id.
-        $this->add_payment_profile_to_cache( $payment_information, $response->customerPaymentProfileId );
+        $this->add_payment_profile_to_cache($payment_information, $response->customerPaymentProfileId);
 
         // Add a note about the validation response.
         $invoice->add_note(
-            sprintf( __( 'Saved Authorize.NET payment profile: %s', 'invoicing' ), $response->validationDirectResponse ),
+            sprintf(__('Saved Authorize.NET payment profile: %s', 'invoicing'), $response->validationDirectResponse),
             false,
             false,
             true
         );
 
-        update_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), $customer_profile );
+        update_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), $customer_profile);
 
         return $response->customerPaymentProfileId;
     }
@@ -308,12 +308,12 @@ 
      * @param array $payment_details.
 	 * @return array|false Profile id.
 	 */
-	public function retrieve_payment_profile_from_cache( $payment_details, $customer_profile, $invoice ) {
+	public function retrieve_payment_profile_from_cache($payment_details, $customer_profile, $invoice) {
 
-        $cached_information = get_option( 'getpaid_authorize_net_cached_profiles', array() );
-        $payment_details    = hash_hmac( 'sha256', json_encode( $payment_details ), SECURE_AUTH_KEY );
+        $cached_information = get_option('getpaid_authorize_net_cached_profiles', array());
+        $payment_details    = hash_hmac('sha256', json_encode($payment_details), SECURE_AUTH_KEY);
 
-        if ( ! is_array( $cached_information ) || ! array_key_exists( $payment_details, $cached_information ) ) {
+        if (!is_array($cached_information) || !array_key_exists($payment_details, $cached_information)) {
             return false;
         }
 
@@ -322,13 +322,13 @@ 
             'getCustomerPaymentProfileRequest' => array(
                 'merchantAuthentication'   => $this->get_auth_params(),
                 'customerProfileId'        => $customer_profile,
-                'customerPaymentProfileId' => $cached_information[ $payment_details ],
+                'customerPaymentProfileId' => $cached_information[$payment_details],
             ),
         );
 
-        $response = $this->post( $args, $invoice );
+        $response = $this->post($args, $invoice);
 
-        return is_wp_error( $response ) ? false : $cached_information[ $payment_details ];
+        return is_wp_error($response) ? false : $cached_information[$payment_details];
 
     }
 
@@ -339,14 +339,14 @@ 
      * @param array $payment_details.
      * @param string $payment_profile_id.
 	 */
-	public function add_payment_profile_to_cache( $payment_details, $payment_profile_id ) {
+	public function add_payment_profile_to_cache($payment_details, $payment_profile_id) {
 
-        $cached_information = get_option( 'getpaid_authorize_net_cached_profiles', array() );
-        $cached_information = is_array( $cached_information ) ? $cached_information : array();
-        $payment_details    = hash_hmac( 'sha256', json_encode( $payment_details ), SECURE_AUTH_KEY );
+        $cached_information = get_option('getpaid_authorize_net_cached_profiles', array());
+        $cached_information = is_array($cached_information) ? $cached_information : array();
+        $payment_details    = hash_hmac('sha256', json_encode($payment_details), SECURE_AUTH_KEY);
 
-        $cached_information[ $payment_details ] = $payment_profile_id;
-        update_option( 'getpaid_authorize_net_cached_profiles', $cached_information );
+        $cached_information[$payment_details] = $payment_profile_id;
+        update_option('getpaid_authorize_net_cached_profiles', $cached_information);
 
     }
 
@@ -359,7 +359,7 @@ 
 	 * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-payment-profile
 	 */
-	public function get_customer_payment_profile( $customer_profile_id, $payment_profile_id ) {
+	public function get_customer_payment_profile($customer_profile_id, $payment_profile_id) {
 
         // Generate args.
         $args = array(
@@ -370,7 +370,7 @@ 
             ),
         );
 
-        return $this->post( $args, false );
+        return $this->post($args, false);
 
     }
 
@@ -383,7 +383,7 @@ 
      * @link https://developer.authorize.net/api/reference/index.html#payment-transactions-charge-a-customer-profile
 	 * @return WP_Error|object
 	 */
-	public function charge_customer_payment_profile( $customer_profile_id, $payment_profile_id, $invoice ) {
+	public function charge_customer_payment_profile($customer_profile_id, $payment_profile_id, $invoice) {
 
         // Generate args.
         $args = array(
@@ -403,28 +403,28 @@ 
                         ),
                     ),
                     'order'           => array(
-                        'invoiceNumber' => getpaid_limit_length( $invoice->get_number(), 20 ),
+                        'invoiceNumber' => getpaid_limit_length($invoice->get_number(), 20),
                     ),
-                    'lineItems'       => array( 'lineItem' => $this->get_line_items( $invoice ) ),
+                    'lineItems'       => array('lineItem' => $this->get_line_items($invoice)),
                     'tax'             => array(
                         'amount' => $invoice->get_total_tax(),
-                        'name'   => __( 'TAX', 'invoicing' ),
+                        'name'   => __('TAX', 'invoicing'),
                     ),
-                    'poNumber'        => getpaid_limit_length( $invoice->get_number(), 25 ),
+                    'poNumber'        => getpaid_limit_length($invoice->get_number(), 25),
                     'customer'        => array(
-                        'id'    => getpaid_limit_length( $invoice->get_user_id(), 25 ),
-                        'email' => getpaid_limit_length( $invoice->get_email(), 25 ),
+                        'id'    => getpaid_limit_length($invoice->get_user_id(), 25),
+                        'email' => getpaid_limit_length($invoice->get_email(), 25),
                     ),
                     'customerIP'      => $invoice->get_ip(),
                 ),
             ),
         );
 
-        if ( 0 == $invoice->get_total_tax() ) {
-            unset( $args['createTransactionRequest']['transactionRequest']['tax'] );
+        if (0 == $invoice->get_total_tax()) {
+            unset($args['createTransactionRequest']['transactionRequest']['tax']);
         }
 
-        return $this->post( apply_filters( 'getpaid_authorizenet_charge_customer_payment_profile_args', $args, $invoice ), $invoice );
+        return $this->post(apply_filters('getpaid_authorizenet_charge_customer_payment_profile_args', $args, $invoice), $invoice);
 
     }
 
@@ -434,29 +434,29 @@ 
      * @param stdClass $result Api response.
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function process_charge_response( $result, $invoice ) {
+	public function process_charge_response($result, $invoice) {
 
         wpinv_clear_errors();
 		$response_code = (int) $result->transactionResponse->responseCode;
 
 		// Succeeded.
-		if ( 1 == $response_code || 4 == $response_code ) {
+		if (1 == $response_code || 4 == $response_code) {
 
 			// Maybe set a transaction id.
-			if ( ! empty( $result->transactionResponse->transId ) ) {
-				$invoice->set_transaction_id( $result->transactionResponse->transId );
+			if (!empty($result->transactionResponse->transId)) {
+				$invoice->set_transaction_id($result->transactionResponse->transId);
 			}
 
-			$invoice->add_note( sprintf( __( 'Authentication code: %1$s (%2$s).', 'invoicing' ), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber ), false, false, true );
+			$invoice->add_note(sprintf(__('Authentication code: %1$s (%2$s).', 'invoicing'), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber), false, false, true);
 
-			if ( 1 == $response_code ) {
+			if (1 == $response_code) {
 				return $invoice->mark_paid();
 			}
 
-			$invoice->set_status( 'wpi-onhold' );
+			$invoice->set_status('wpi-onhold');
         	$invoice->add_note(
                 sprintf(
-                    __( 'Held for review: %s', 'invoicing' ),
+                    __('Held for review: %s', 'invoicing'),
                     $result->transactionResponse->messages->message[0]->description
                 )
 			);
@@ -465,11 +465,11 @@ 
 
 		}
 
-        wpinv_set_error( 'card_declined' );
+        wpinv_set_error('card_declined');
 
-        if ( ! empty( $result->transactionResponse->errors ) ) {
+        if (!empty($result->transactionResponse->errors)) {
             $errors = (object) $result->transactionResponse->errors;
-            wpinv_set_error( $errors->error[0]->errorCode, esc_html( $errors->error[0]->errorText ) );
+            wpinv_set_error($errors->error[0]->errorCode, esc_html($errors->error[0]->errorText));
         }
 
     }
@@ -481,7 +481,7 @@ 
 	 * @param array $card Card details.
 	 * @return array
 	 */
-	public function get_payment_information( $card ) {
+	public function get_payment_information($card) {
         return array(
 
             'creditCard' => array(
@@ -500,8 +500,8 @@ 
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return string
 	 */
-	public function get_customer_profile_meta_name( $invoice ) {
-        return $this->is_sandbox( $invoice ) ? 'getpaid_authorizenet_sandbox_customer_profile_id' : 'getpaid_authorizenet_customer_profile_id';
+	public function get_customer_profile_meta_name($invoice) {
+        return $this->is_sandbox($invoice) ? 'getpaid_authorizenet_sandbox_customer_profile_id' : 'getpaid_authorizenet_customer_profile_id';
     }
 
     /**
@@ -512,34 +512,34 @@ 
      * @param WPInv_Invoice $invoice
 	 * @return WP_Error|string The payment profile id
 	 */
-	public function validate_submission_data( $submission_data, $invoice ) {
+	public function validate_submission_data($submission_data, $invoice) {
 
         // Validate authentication details.
         $auth = $this->get_auth_params();
 
-        if ( empty( $auth['name'] ) || empty( $auth['transactionKey'] ) ) {
-            return new WP_Error( 'invalid_settings', __( 'Please set-up your login id and transaction key before using this gateway.', 'invoicing' ) );
+        if (empty($auth['name']) || empty($auth['transactionKey'])) {
+            return new WP_Error('invalid_settings', __('Please set-up your login id and transaction key before using this gateway.', 'invoicing'));
         }
 
         // Validate the payment method.
-        if ( empty( $submission_data['getpaid-authorizenet-payment-method'] ) ) {
-            return new WP_Error( 'invalid_payment_method', __( 'Please select a different payment method or add a new card.', 'invoicing' ) );
+        if (empty($submission_data['getpaid-authorizenet-payment-method'])) {
+            return new WP_Error('invalid_payment_method', __('Please select a different payment method or add a new card.', 'invoicing'));
         }
 
         // Are we adding a new payment method?
-        if ( 'new' != $submission_data['getpaid-authorizenet-payment-method'] ) {
+        if ('new' != $submission_data['getpaid-authorizenet-payment-method']) {
             return $submission_data['getpaid-authorizenet-payment-method'];
         }
 
         // Retrieve the customer profile id.
-        $profile_id = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
+        $profile_id = get_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), true);
 
         // Create payment method.
-        if ( empty( $profile_id ) ) {
-            return $this->create_customer_profile( $invoice, $submission_data, ! empty( $submission_data['getpaid-authorizenet-new-payment-method'] ) );
+        if (empty($profile_id)) {
+            return $this->create_customer_profile($invoice, $submission_data, !empty($submission_data['getpaid-authorizenet-new-payment-method']));
         }
 
-        return $this->create_customer_payment_profile( $profile_id, $invoice, $submission_data, ! empty( $submission_data['getpaid-authorizenet-new-payment-method'] ) );
+        return $this->create_customer_payment_profile($profile_id, $invoice, $submission_data, !empty($submission_data['getpaid-authorizenet-new-payment-method']));
 
     }
 
@@ -550,32 +550,32 @@ 
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return array
 	 */
-	public function get_line_items( $invoice ) {
+	public function get_line_items($invoice) {
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
+        foreach ($invoice->get_items() as $item) {
 
             $amount  = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
             $items[] = array(
-                'itemId'      => getpaid_limit_length( $item->get_id(), 31 ),
-                'name'        => getpaid_limit_length( $item->get_raw_name(), 31 ),
-                'description' => getpaid_limit_length( $item->get_description(), 255 ),
-                'quantity'    => (string) ( $invoice->get_template() == 'amount' ? 1 : $item->get_quantity() ),
+                'itemId'      => getpaid_limit_length($item->get_id(), 31),
+                'name'        => getpaid_limit_length($item->get_raw_name(), 31),
+                'description' => getpaid_limit_length($item->get_description(), 255),
+                'quantity'    => (string) ($invoice->get_template() == 'amount' ? 1 : $item->get_quantity()),
                 'unitPrice'   => (float) $amount,
                 'taxable'     => wpinv_use_taxes() && $invoice->is_taxable() && 'tax-exempt' != $item->get_vat_rule(),
             );
 
         }
 
-        foreach ( $invoice->get_fees() as $fee_name => $fee ) {
+        foreach ($invoice->get_fees() as $fee_name => $fee) {
 
-            $amount  = $invoice->is_renewal() ? $fee['recurring_fee'] : $fee['initial_fee'];
+            $amount = $invoice->is_renewal() ? $fee['recurring_fee'] : $fee['initial_fee'];
 
-            if ( $amount > 0 ) {
+            if ($amount > 0) {
                 $items[] = array(
-                    'itemId'      => getpaid_limit_length( $fee_name, 31 ),
-                    'name'        => getpaid_limit_length( $fee_name, 31 ),
-                    'description' => getpaid_limit_length( $fee_name, 255 ),
+                    'itemId'      => getpaid_limit_length($fee_name, 31),
+                    'name'        => getpaid_limit_length($fee_name, 31),
+                    'description' => getpaid_limit_length($fee_name, 255),
                     'quantity'    => '1',
                     'unitPrice'   => (float) $amount,
                     'taxable'     => false,
@@ -595,36 +595,36 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Validate the submitted data.
-        $payment_profile_id = $this->validate_submission_data( $submission_data, $invoice );
+        $payment_profile_id = $this->validate_submission_data($submission_data, $invoice);
 
         // Do we have an error?
-        if ( is_wp_error( $payment_profile_id ) ) {
-            wpinv_set_error( $payment_profile_id->get_error_code(), $payment_profile_id->get_error_message() );
-            wpinv_send_back_to_checkout( $invoice );
+        if (is_wp_error($payment_profile_id)) {
+            wpinv_set_error($payment_profile_id->get_error_code(), $payment_profile_id->get_error_message());
+            wpinv_send_back_to_checkout($invoice);
         }
 
         // Save the payment method to the order.
-        update_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', $payment_profile_id );
+        update_post_meta($invoice->get_id(), 'getpaid_authorizenet_profile_id', $payment_profile_id);
 
         // Check if this is a subscription or not.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-        if ( ! empty( $subscriptions ) ) {
-            $this->process_subscription( $invoice, $subscriptions );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
+        if (!empty($subscriptions)) {
+            $this->process_subscription($invoice, $subscriptions);
         }
 
         // If it is free, send to the success page.
-        if ( ! $invoice->needs_payment() ) {
+        if (!$invoice->needs_payment()) {
             $invoice->mark_paid();
-            wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+            wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
         }
 
         // Charge the payment profile.
-        $this->process_initial_payment( $invoice );
+        $this->process_initial_payment($invoice);
 
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
         exit;
 
@@ -635,23 +635,23 @@ 
 	 *
      * @param WPInv_Invoice $invoice Invoice.
 	 */
-	protected function process_initial_payment( $invoice ) {
+	protected function process_initial_payment($invoice) {
 
-		$payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-        $customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
+		$payment_profile_id = get_post_meta($invoice->get_id(), 'getpaid_authorizenet_profile_id', true);
+        $customer_profile = get_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), true);
+		$result             = $this->charge_customer_payment_profile($customer_profile, $payment_profile_id, $invoice);
 
 		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
-			wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
-			wpinv_send_back_to_checkout( $invoice );
+		if (is_wp_error($result)) {
+			wpinv_set_error($result->get_error_code(), $result->get_error_message());
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 		// Process the response.
-		$this->process_charge_response( $result, $invoice );
+		$this->process_charge_response($result, $invoice);
 
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
+		if (wpinv_get_errors()) {
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 	}
@@ -662,30 +662,30 @@ 
      * @param WPInv_Invoice $invoice Invoice.
      * @param WPInv_Subscription[]|WPInv_Subscription $subscriptions Subscriptions.
 	 */
-	public function process_subscription( $invoice, $subscriptions ) {
+	public function process_subscription($invoice, $subscriptions) {
 
         // Check if there is an initial amount to charge.
-        if ( (float) $invoice->get_total() > 0 ) {
-			$this->process_initial_payment( $invoice );
+        if ((float) $invoice->get_total() > 0) {
+			$this->process_initial_payment($invoice);
         }
 
         // Activate the subscriptions.
-        $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+        $subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-        foreach ( $subscriptions as $subscription ) {
-            if ( $subscription->exists() ) {
-                $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-                $expiry   = date( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+        foreach ($subscriptions as $subscription) {
+            if ($subscription->exists()) {
+                $duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+                $expiry   = date('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-                $subscription->set_next_renewal_date( $expiry );
-                $subscription->set_date_created( current_time( 'mysql' ) );
-                $subscription->set_profile_id( $invoice->generate_key( 'authnet_sub_' . $invoice->get_id() . '_' . $subscription->get_id() ) );
+                $subscription->set_next_renewal_date($expiry);
+                $subscription->set_date_created(current_time('mysql'));
+                $subscription->set_profile_id($invoice->generate_key('authnet_sub_' . $invoice->get_id() . '_' . $subscription->get_id()));
                 $subscription->activate();
             }
         }
 
 		// Redirect to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -695,11 +695,11 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
-            $this->renew_subscription( $subscription );
+        if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
+            $this->renew_subscription($subscription);
         }
 
 	}
@@ -709,28 +709,28 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function renew_subscription( $subscription ) {
+	public function renew_subscription($subscription) {
 
 		// Generate the renewal invoice.
 		$new_invoice = $subscription->create_payment();
 		$old_invoice = $subscription->get_parent_payment();
 
-        if ( empty( $new_invoice ) ) {
-            $old_invoice->add_note( __( 'Error generating a renewal invoice.', 'invoicing' ), false, false, false );
+        if (empty($new_invoice)) {
+            $old_invoice->add_note(__('Error generating a renewal invoice.', 'invoicing'), false, false, false);
             $subscription->failing();
             return;
         }
 
         // Charge the payment method.
-		$payment_profile_id = get_post_meta( $old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $old_invoice->get_user_id(), $this->get_customer_profile_meta_name( $old_invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $new_invoice );
+		$payment_profile_id = get_post_meta($old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true);
+		$customer_profile   = get_user_meta($old_invoice->get_user_id(), $this->get_customer_profile_meta_name($old_invoice), true);
+		$result             = $this->charge_customer_payment_profile($customer_profile, $payment_profile_id, $new_invoice);
 
 		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 
 			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), $result->get_error_message() ),
+				sprintf(__('Error renewing subscription : ( %s ).', 'invoicing'), $result->get_error_message()),
 				true,
 				false,
 				true
@@ -741,12 +741,12 @@ 
 		}
 
 		// Process the response.
-		$this->process_charge_response( $result, $new_invoice );
+		$this->process_charge_response($result, $new_invoice);
 
-		if ( wpinv_get_errors() ) {
+		if (wpinv_get_errors()) {
 
 			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), getpaid_get_errors_html() ),
+				sprintf(__('Error renewing subscription : ( %s ).', 'invoicing'), getpaid_get_errors_html()),
 				true,
 				false,
 				true
@@ -756,7 +756,7 @@ 
 
         }
 
-        $subscription->add_payment( array(), $new_invoice );
+        $subscription->add_payment(array(), $new_invoice);
         $subscription->renew();
     }
 
@@ -767,33 +767,33 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
         global $getpaid_authorize_addons;
 
         $getpaid_authorize_addons = array();
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
 
-            if ( is_null( $invoice->get_item( $item->get_id() ) ) && ! is_wp_error( $invoice->add_item( $item ) ) ) {
+            if (is_null($invoice->get_item($item->get_id())) && !is_wp_error($invoice->add_item($item))) {
                 $getpaid_authorize_addons[] = $item;
             }
 }
 
-        if ( empty( $getpaid_authorize_addons ) ) {
+        if (empty($getpaid_authorize_addons)) {
             return;
         }
 
         $invoice->recalculate_total();
 
-        $payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
+        $payment_profile_id = get_post_meta($invoice->get_id(), 'getpaid_authorizenet_profile_id', true);
+		$customer_profile = get_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), true);
 
-        add_filter( 'getpaid_authorizenet_charge_customer_payment_profile_args', array( $this, 'filter_addons_request' ), 10, 2 );
-        $result = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
-        remove_filter( 'getpaid_authorizenet_charge_customer_payment_profile_args', array( $this, 'filter_addons_request' ) );
+        add_filter('getpaid_authorizenet_charge_customer_payment_profile_args', array($this, 'filter_addons_request'), 10, 2);
+        $result = $this->charge_customer_payment_profile($customer_profile, $payment_profile_id, $invoice);
+        remove_filter('getpaid_authorizenet_charge_customer_payment_profile_args', array($this, 'filter_addons_request'));
 
-        if ( is_wp_error( $result ) ) {
-            wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
+        if (is_wp_error($result)) {
+            wpinv_set_error($result->get_error_code(), $result->get_error_message());
             return;
         }
 
@@ -806,19 +806,19 @@ 
      * @param array $args
 	 * @return array
 	 */
-    public function filter_addons_request( $args ) {
+    public function filter_addons_request($args) {
 
         global $getpaid_authorize_addons;
         $total = 0;
 
-        foreach ( $getpaid_authorize_addons as $addon ) {
+        foreach ($getpaid_authorize_addons as $addon) {
             $total += $addon->get_sub_total();
         }
 
         $args['createTransactionRequest']['transactionRequest']['amount'] = $total;
 
-        if ( isset( $args['createTransactionRequest']['transactionRequest']['tax'] ) ) {
-            unset( $args['createTransactionRequest']['transactionRequest']['tax'] );
+        if (isset($args['createTransactionRequest']['transactionRequest']['tax'])) {
+            unset($args['createTransactionRequest']['transactionRequest']['tax']);
         }
 
         return $args;
@@ -831,7 +831,7 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-            __( 'SANDBOX ENABLED. You can use sandbox testing details only. See the %1$sAuthorize.NET Sandbox Testing Guide%2$s for more details.', 'invoicing' ),
+            __('SANDBOX ENABLED. You can use sandbox testing details only. See the %1$sAuthorize.NET Sandbox Testing Guide%2$s for more details.', 'invoicing'),
             '<a href="https://developer.authorize.net/hello_world/testing_guide.html">',
             '</a>'
         );
@@ -843,42 +843,42 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['authorizenet_active']['desc'] .= " ($currencies)";
-        $admin_settings['authorizenet_desc']['std']     = __( 'Pay securely using your credit or debit card.', 'invoicing' );
+        $admin_settings['authorizenet_desc']['std']     = __('Pay securely using your credit or debit card.', 'invoicing');
 
         $admin_settings['authorizenet_login_id'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_login_id',
-            'name' => __( 'API Login ID', 'invoicing' ),
-            'desc' => '<a href="https://support.authorize.net/s/article/How-do-I-obtain-my-API-Login-ID-and-Transaction-Key"><em>' . __( 'How do I obtain my API Login ID and Transaction Key?', 'invoicing' ) . '</em></a>',
+            'name' => __('API Login ID', 'invoicing'),
+            'desc' => '<a href="https://support.authorize.net/s/article/How-do-I-obtain-my-API-Login-ID-and-Transaction-Key"><em>' . __('How do I obtain my API Login ID and Transaction Key?', 'invoicing') . '</em></a>',
         );
 
         $admin_settings['authorizenet_transaction_key'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_transaction_key',
-            'name' => __( 'Transaction Key', 'invoicing' ),
+            'name' => __('Transaction Key', 'invoicing'),
         );
 
         $admin_settings['authorizenet_signature_key'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_signature_key',
-            'name' => __( 'Signature Key', 'invoicing' ),
-            'desc' => '<a href="https://support.authorize.net/s/article/What-is-a-Signature-Key"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'name' => __('Signature Key', 'invoicing'),
+            'desc' => '<a href="https://support.authorize.net/s/article/What-is-a-Signature-Key"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
         );
 
         $admin_settings['authorizenet_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'authorizenet_ipn_url',
-            'name'     => __( 'Webhook URL', 'invoicing' ),
+            'name'     => __('Webhook URL', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( 'Create a new webhook using this URL as the endpoint URL and set it to receive all payment events.', 'invoicing' ) . ' <a href="https://support.authorize.net/s/article/How-do-I-add-edit-Webhook-notification-end-points"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'desc'     => __('Create a new webhook using this URL as the endpoint URL and set it to receive all payment events.', 'invoicing') . ' <a href="https://support.authorize.net/s/article/How-do-I-add-edit-Webhook-notification-end-points"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
             'custom'   => 'authorizenet',
             'readonly' => true,
         );

includes/class-getpaid-daily-maintenance.php

Indentation +139 added lines, -139 removed lines

@@ -12,144 +12,144 @@
  */
 class GetPaid_Daily_Maintenance {
 
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-
-		// Clear deprecated events.
-		add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
-
-		// (Maybe) schedule a cron that runs daily.
-		add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
-
-		// Fired everyday at 7 a.m (this might vary for sites with few visitors)
-		add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'check_renewing_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
-
-	}
-
-	/**
-	 * Schedules a cron to run every day at 7 a.m
-	 *
-	 */
-	public function maybe_create_scheduled_event() {
-
-		if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
-			$timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
-			wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
-		}
-
-	}
-
-	/**
-	 * Clears deprecated events.
-	 *
-	 */
-	public function maybe_clear_deprecated_events() {
-
-		if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
-			update_option( 'wpinv_cleared_old_events', 1 );
-		}
-
-	}
-
-	/**
-	 * Fires the old hook for backwards compatibility.
-	 *
-	 */
-	public function backwards_compat() {
-		do_action( 'wpinv_register_schedule_event_daily' );
-	}
-
-	/**
-	 * Checks for subscriptions that are scheduled to renew.
-	 *
-	 */
-	public function check_renewing_subscriptions() {
-
-		// Fetch subscriptions that expire today.
-		$args  = array(
-			'number'             => -1,
-			'count_total'        => false,
-			'status'             => 'trialling active',
-			'date_expires_query' => array(
-				array(
-					'year'    => gmdate( 'Y' ),
-					'month'   => gmdate( 'n' ),
-					'day'     => gmdate( 'j' ),
-					'compare' => '=',
-				),
-			),
-		);
-
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
-
-		foreach ( $subscriptions->get_results() as $subscription ) {
-
-			/** @var WPInv_Subscription $subscription */
-			if ( $subscription->is_last_renewal() ) {
-				$subscription->complete();
-			} else {
-				do_action( 'getpaid_should_renew_subscription', $subscription );
-			}
-		}
-
-	}
-
-	/**
-	 * Expires expired subscriptions.
-	 *
-	 */
-	public function maybe_expire_subscriptions() {
-
-		// Fetch expired subscriptions (skips those that expire today).
-		$args  = array(
-			'number'             => -1,
-			'count_total'        => false,
-			'status'             => 'trialling active failing cancelled',
-			'date_expires_query' => array(
-				'before'    => 'yesterday',
-				'inclusive' => false,
-			),
-		);
-
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
-
-		foreach ( $subscriptions->get_results() as $subscription ) {
-			if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', false, $subscription ) ) {
-				$subscription->set_status( 'expired' );
-				$subscription->save();
-			}
-		}
-
-	}
-
-	/**
-	 * Logs cron runs.
-	 *
-	 */
-	public function log_cron_run() {
-		wpinv_error_log( 'GetPaid Daily Cron', false );
-	}
-
-	/**
-	 * Updates GeoIP databases.
-	 *
-	 */
-	public function maybe_update_geoip_databases() {
-		$updated = get_transient( 'getpaid_updated_geoip_databases' );
-
-		if ( false === $updated ) {
-			set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
-			do_action( 'getpaid_update_geoip_databases' );
-		}
-
-	}
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+
+        // Clear deprecated events.
+        add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
+
+        // (Maybe) schedule a cron that runs daily.
+        add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
+
+        // Fired everyday at 7 a.m (this might vary for sites with few visitors)
+        add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'check_renewing_subscriptions' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
+
+    }
+
+    /**
+     * Schedules a cron to run every day at 7 a.m
+     *
+     */
+    public function maybe_create_scheduled_event() {
+
+        if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
+            $timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
+            wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
+        }
+
+    }
+
+    /**
+     * Clears deprecated events.
+     *
+     */
+    public function maybe_clear_deprecated_events() {
+
+        if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
+            wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
+            wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
+            update_option( 'wpinv_cleared_old_events', 1 );
+        }
+
+    }
+
+    /**
+     * Fires the old hook for backwards compatibility.
+     *
+     */
+    public function backwards_compat() {
+        do_action( 'wpinv_register_schedule_event_daily' );
+    }
+
+    /**
+     * Checks for subscriptions that are scheduled to renew.
+     *
+     */
+    public function check_renewing_subscriptions() {
+
+        // Fetch subscriptions that expire today.
+        $args  = array(
+            'number'             => -1,
+            'count_total'        => false,
+            'status'             => 'trialling active',
+            'date_expires_query' => array(
+                array(
+                    'year'    => gmdate( 'Y' ),
+                    'month'   => gmdate( 'n' ),
+                    'day'     => gmdate( 'j' ),
+                    'compare' => '=',
+                ),
+            ),
+        );
+
+        $subscriptions = new GetPaid_Subscriptions_Query( $args );
+
+        foreach ( $subscriptions->get_results() as $subscription ) {
+
+            /** @var WPInv_Subscription $subscription */
+            if ( $subscription->is_last_renewal() ) {
+                $subscription->complete();
+            } else {
+                do_action( 'getpaid_should_renew_subscription', $subscription );
+            }
+        }
+
+    }
+
+    /**
+     * Expires expired subscriptions.
+     *
+     */
+    public function maybe_expire_subscriptions() {
+
+        // Fetch expired subscriptions (skips those that expire today).
+        $args  = array(
+            'number'             => -1,
+            'count_total'        => false,
+            'status'             => 'trialling active failing cancelled',
+            'date_expires_query' => array(
+                'before'    => 'yesterday',
+                'inclusive' => false,
+            ),
+        );
+
+        $subscriptions = new GetPaid_Subscriptions_Query( $args );
+
+        foreach ( $subscriptions->get_results() as $subscription ) {
+            if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', false, $subscription ) ) {
+                $subscription->set_status( 'expired' );
+                $subscription->save();
+            }
+        }
+
+    }
+
+    /**
+     * Logs cron runs.
+     *
+     */
+    public function log_cron_run() {
+        wpinv_error_log( 'GetPaid Daily Cron', false );
+    }
+
+    /**
+     * Updates GeoIP databases.
+     *
+     */
+    public function maybe_update_geoip_databases() {
+        $updated = get_transient( 'getpaid_updated_geoip_databases' );
+
+        if ( false === $updated ) {
+            set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
+            do_action( 'getpaid_update_geoip_databases' );
+        }
+
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Daily maintenance class.
@@ -18,17 +18,17 @@ 
 	public function __construct() {
 
 		// Clear deprecated events.
-		add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
+		add_action('wp', array($this, 'maybe_clear_deprecated_events'));
 
 		// (Maybe) schedule a cron that runs daily.
-		add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
+		add_action('wp', array($this, 'maybe_create_scheduled_event'));
 
 		// Fired everyday at 7 a.m (this might vary for sites with few visitors)
-		add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'check_renewing_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
+		add_action('getpaid_daily_maintenance', array($this, 'log_cron_run'));
+		add_action('getpaid_daily_maintenance', array($this, 'backwards_compat'));
+		add_action('getpaid_daily_maintenance', array($this, 'maybe_expire_subscriptions'));
+		add_action('getpaid_daily_maintenance', array($this, 'check_renewing_subscriptions'));
+		add_action('getpaid_daily_maintenance', array($this, 'maybe_update_geoip_databases'));
 
 	}
 
@@ -38,9 +38,9 @@ 
 	 */
 	public function maybe_create_scheduled_event() {
 
-		if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
-			$timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
-			wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
+		if (!wp_next_scheduled('getpaid_daily_maintenance')) {
+			$timestamp = strtotime('tomorrow 07:00:00', current_time('timestamp'));
+			wp_schedule_event($timestamp, 'daily', 'getpaid_daily_maintenance');
 		}
 
 	}
@@ -51,10 +51,10 @@ 
 	 */
 	public function maybe_clear_deprecated_events() {
 
-		if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
-			update_option( 'wpinv_cleared_old_events', 1 );
+		if (!get_option('wpinv_cleared_old_events')) {
+			wp_clear_scheduled_hook('wpinv_register_schedule_event_twicedaily');
+			wp_clear_scheduled_hook('wpinv_register_schedule_event_daily');
+			update_option('wpinv_cleared_old_events', 1);
 		}
 
 	}
@@ -64,7 +64,7 @@ 
 	 *
 	 */
 	public function backwards_compat() {
-		do_action( 'wpinv_register_schedule_event_daily' );
+		do_action('wpinv_register_schedule_event_daily');
 	}
 
 	/**
@@ -74,29 +74,29 @@ 
 	public function check_renewing_subscriptions() {
 
 		// Fetch subscriptions that expire today.
-		$args  = array(
+		$args = array(
 			'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active',
 			'date_expires_query' => array(
 				array(
-					'year'    => gmdate( 'Y' ),
-					'month'   => gmdate( 'n' ),
-					'day'     => gmdate( 'j' ),
+					'year'    => gmdate('Y'),
+					'month'   => gmdate('n'),
+					'day'     => gmdate('j'),
 					'compare' => '=',
 				),
 			),
 		);
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-		foreach ( $subscriptions->get_results() as $subscription ) {
+		foreach ($subscriptions->get_results() as $subscription) {
 
 			/** @var WPInv_Subscription $subscription */
-			if ( $subscription->is_last_renewal() ) {
+			if ($subscription->is_last_renewal()) {
 				$subscription->complete();
 			} else {
-				do_action( 'getpaid_should_renew_subscription', $subscription );
+				do_action('getpaid_should_renew_subscription', $subscription);
 			}
 		}
 
@@ -109,7 +109,7 @@ 
 	public function maybe_expire_subscriptions() {
 
 		// Fetch expired subscriptions (skips those that expire today).
-		$args  = array(
+		$args = array(
 			'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active failing cancelled',
@@ -119,11 +119,11 @@ 
 			),
 		);
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-		foreach ( $subscriptions->get_results() as $subscription ) {
-			if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', false, $subscription ) ) {
-				$subscription->set_status( 'expired' );
+		foreach ($subscriptions->get_results() as $subscription) {
+			if (apply_filters('getpaid_daily_maintenance_should_expire_subscription', false, $subscription)) {
+				$subscription->set_status('expired');
 				$subscription->save();
 			}
 		}
@@ -135,7 +135,7 @@ 
 	 *
 	 */
 	public function log_cron_run() {
-		wpinv_error_log( 'GetPaid Daily Cron', false );
+		wpinv_error_log('GetPaid Daily Cron', false);
 	}
 
 	/**
@@ -143,11 +143,11 @@ 
 	 *
 	 */
 	public function maybe_update_geoip_databases() {
-		$updated = get_transient( 'getpaid_updated_geoip_databases' );
+		$updated = get_transient('getpaid_updated_geoip_databases');
 
-		if ( false === $updated ) {
-			set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
-			do_action( 'getpaid_update_geoip_databases' );
+		if (false === $updated) {
+			set_transient('getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS);
+			do_action('getpaid_update_geoip_databases');
 		}
 
 	}

invoicing.php

Indentation +4 added lines, -4 removed lines

@@ -19,16 +19,16 @@ 
 
 // Define constants.
 if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+    define( 'WPINV_PLUGIN_FILE', __FILE__ );
 }
 
 if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.7.6' );
+    define( 'WPINV_VERSION', '2.7.6' );
 }
 
 // Include the main Invoicing class.
 if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+    require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -43,7 +43,7 @@ 
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
-	return $GLOBALS['invoicing'];
+    return $GLOBALS['invoicing'];
 }
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -15,20 +15,20 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Define constants.
-if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+if (!defined('WPINV_PLUGIN_FILE')) {
+	define('WPINV_PLUGIN_FILE', __FILE__);
 }
 
-if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.7.6' );
+if (!defined('WPINV_VERSION')) {
+	define('WPINV_VERSION', '2.7.6');
 }
 
 // Include the main Invoicing class.
-if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+if (!class_exists('WPInv_Plugin', false)) {
+	require_once plugin_dir_path(WPINV_PLUGIN_FILE) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -39,7 +39,7 @@ 
  */
 function getpaid() {
 
-    if ( empty( $GLOBALS['invoicing'] ) ) {
+    if (empty($GLOBALS['invoicing'])) {
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
@@ -52,9 +52,9 @@ 
  * @since  2.0.8
  */
 function getpaid_deactivation_hook() {
-    update_option( 'wpinv_flush_permalinks', 1 );
+    update_option('wpinv_flush_permalinks', 1);
 }
-register_deactivation_hook( __FILE__, 'getpaid_deactivation_hook' );
+register_deactivation_hook(__FILE__, 'getpaid_deactivation_hook');
 
 /**
  * @deprecated
@@ -64,4 +64,4 @@ 
 }
 
 // Kickstart the plugin.
-add_action( 'plugins_loaded', 'getpaid', -100 );
+add_action('plugins_loaded', 'getpaid', -100);

includes/data/email-settings.php

Spacing +228 added lines, -228 removed lines

@@ -8,24 +8,24 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the due date reminder options.
 $overdue_days_options       = array();
-$overdue_days_options['0']  = __( 'On the Due Date', 'invoicing' );
-$overdue_days_options['1']  = __( '1 day after Due Date', 'invoicing' );
+$overdue_days_options['0']  = __('On the Due Date', 'invoicing');
+$overdue_days_options['1']  = __('1 day after Due Date', 'invoicing');
 
-for ( $i = 2; $i <= 45; $i++ ) {
-    $overdue_days_options[ "$i" ] = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
+for ($i = 2; $i <= 45; $i++) {
+    $overdue_days_options["$i"] = wp_sprintf(__('%d days after Due Date', 'invoicing'), $i);
 }
 
 // Prepare up coming renewal reminder options.
 $renewal_days_options       = array();
-$renewal_days_options['0']  = __( 'On the renewal date', 'invoicing' );
-$renewal_days_options['1']  = __( '1 day before the renewal date', 'invoicing' );
+$renewal_days_options['0']  = __('On the renewal date', 'invoicing');
+$renewal_days_options['1']  = __('1 day before the renewal date', 'invoicing');
 
-for ( $i = 2; $i <= 45; $i++ ) {
-    $renewal_days_options[ "$i" ]   = wp_sprintf( __( '%d days before the renewal date', 'invoicing' ), $i );
+for ($i = 2; $i <= 45; $i++) {
+    $renewal_days_options["$i"] = wp_sprintf(__('%d days before the renewal date', 'invoicing'), $i);
 }
 
 // Default, built-in gateways
@@ -34,45 +34,45 @@ 
 
         'email_new_invoice_header'  => array(
             'id'   => 'email_new_invoice_header',
-            'name' => '<h3>' . __( 'New Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to the site admin whenever there is a new invoice.', 'invoicing' ),
+            'name' => '<h3>' . __('New Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to the site admin whenever there is a new invoice.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_new_invoice_active'  => array(
             'id'   => 'email_new_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_new_invoice_subject' => array(
             'id'       => 'email_new_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing' ),
+            'std'      => __('[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_new_invoice_heading' => array(
             'id'       => 'email_new_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'New invoice', 'invoicing' ),
+            'std'      => __('New invoice', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_new_invoice_body'    => array(
             'id'    => 'email_new_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -82,53 +82,53 @@ 
 
         'email_cancelled_invoice_header'    => array(
             'id'   => 'email_cancelled_invoice_header',
-            'name' => '<h3>' . __( 'Cancelled Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers whenever invoices are cancelled.', 'invoicing' ),
+            'name' => '<h3>' . __('Cancelled Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers whenever invoices are cancelled.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_cancelled_invoice_active'    => array(
             'id'   => 'email_cancelled_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_cancelled_invoice_admin_bcc' => array(
             'id'   => 'email_cancelled_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_cancelled_invoice_subject'   => array(
             'id'       => 'email_cancelled_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Invoice ({invoice_number}) Cancelled', 'invoicing' ),
+            'std'      => __('[{site_title}] Invoice ({invoice_number}) Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_cancelled_invoice_heading'   => array(
             'id'       => 'email_cancelled_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Invoice Cancelled', 'invoicing' ),
+            'std'      => __('Invoice Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_cancelled_invoice_body'      => array(
             'id'    => 'email_cancelled_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -139,45 +139,45 @@ 
 
         'email_failed_invoice_header'  => array(
             'id'   => 'email_failed_invoice_header',
-            'name' => '<h3>' . __( 'Failed Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing' ),
+            'name' => '<h3>' . __('Failed Invoice', 'invoicing') . '</h3>',
+            'desc' => __('Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_failed_invoice_active'  => array(
             'id'   => 'email_failed_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_failed_invoice_subject' => array(
             'id'       => 'email_failed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Invoice ({invoice_number}) Payment Failed', 'invoicing' ),
+            'std'      => __('[{site_title}] Invoice ({invoice_number}) Payment Failed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_failed_invoice_heading' => array(
             'id'       => 'email_failed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Invoice Payment Failed', 'invoicing' ),
+            'std'      => __('Invoice Payment Failed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_failed_invoice_body'    => array(
             'id'    => 'email_failed_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -187,53 +187,53 @@ 
 
         'email_onhold_invoice_header'    => array(
             'id'   => 'email_onhold_invoice_header',
-            'name' => '<h3>' . __( 'On Hold Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers whenever their invoices are held.', 'invoicing' ),
+            'name' => '<h3>' . __('On Hold Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers whenever their invoices are held.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_onhold_invoice_active'    => array(
             'id'   => 'email_onhold_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_onhold_invoice_admin_bcc' => array(
             'id'   => 'email_onhold_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_onhold_invoice_subject'   => array(
             'id'       => 'email_onhold_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice is on hold', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice is on hold', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_onhold_invoice_heading'   => array(
             'id'       => 'email_onhold_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice is on hold', 'invoicing' ),
+            'std'      => __('Your invoice is on hold', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_onhold_invoice_body'      => array(
             'id'    => 'email_onhold_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -244,53 +244,53 @@ 
 
         'email_processing_invoice_header'    => array(
             'id'   => 'email_processing_invoice_header',
-            'name' => '<h3>' . __( 'Processing Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to users whenever payments for their invoices are processing.', 'invoicing' ),
+            'name' => '<h3>' . __('Processing Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to users whenever payments for their invoices are processing.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_processing_invoice_active'    => array(
             'id'   => 'email_processing_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_processing_invoice_admin_bcc' => array(
             'id'   => 'email_processing_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_processing_invoice_subject'   => array(
             'id'       => 'email_processing_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your payment is being processed', 'invoicing' ),
+            'std'      => __('[{site_title}] Your payment is being processed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_processing_invoice_heading'   => array(
             'id'       => 'email_processing_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your payment is being processed', 'invoicing' ),
+            'std'      => __('Your payment is being processed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_processing_invoice_body'      => array(
             'id'    => 'email_processing_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -301,61 +301,61 @@ 
 
         'email_completed_invoice_header'         => array(
             'id'   => 'email_completed_invoice_header',
-            'name' => '<h3>' . __( 'Paid Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers when their invoices are marked as paid.', 'invoicing' ),
+            'name' => '<h3>' . __('Paid Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers when their invoices are marked as paid.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_completed_invoice_active'         => array(
             'id'   => 'email_completed_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_completed_invoice_renewal_active' => array(
             'id'   => 'email_completed_invoice_renewal_active',
-            'name' => __( 'Enable renewal notification', 'invoicing' ),
-            'desc' => __( 'Should this email be sent for renewals too?', 'invoicing' ),
+            'name' => __('Enable renewal notification', 'invoicing'),
+            'desc' => __('Should this email be sent for renewals too?', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_completed_invoice_admin_bcc'      => array(
             'id'   => 'email_completed_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_completed_invoice_subject'        => array(
             'id'       => 'email_completed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_completed_invoice_heading'        => array(
             'id'       => 'email_completed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been paid', 'invoicing' ),
+            'std'      => __('Your invoice has been paid', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_completed_invoice_body'           => array(
             'id'    => 'email_completed_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -366,53 +366,53 @@ 
 
         'email_refunded_invoice_header'    => array(
             'id'   => 'email_refunded_invoice_header',
-            'name' => '<h3>' . __( 'Refunded Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to users when their invoices are marked as refunded.', 'invoicing' ),
+            'name' => '<h3>' . __('Refunded Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to users when their invoices are marked as refunded.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_refunded_invoice_active'    => array(
             'id'   => 'email_refunded_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_refunded_invoice_admin_bcc' => array(
             'id'   => 'email_refunded_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_refunded_invoice_subject'   => array(
             'id'       => 'email_refunded_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_refunded_invoice_heading'   => array(
             'id'       => 'email_refunded_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been refunded', 'invoicing' ),
+            'std'      => __('Your invoice has been refunded', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_refunded_invoice_body'      => array(
             'id'    => 'email_refunded_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -423,53 +423,53 @@ 
 
         'email_user_invoice_header'    => array(
             'id'   => 'email_user_invoice_header',
-            'name' => '<h3>' . __( 'Customer Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers containing their invoice information and payment links.', 'invoicing' ),
+            'name' => '<h3>' . __('Customer Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers containing their invoice information and payment links.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_user_invoice_active'    => array(
             'id'   => 'email_user_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_user_invoice_admin_bcc' => array(
             'id'   => 'email_user_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_user_invoice_subject'   => array(
             'id'       => 'email_user_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_invoice_heading'   => array(
             'id'       => 'email_user_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice {invoice_number} details', 'invoicing' ),
+            'std'      => __('Your invoice {invoice_number} details', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_invoice_body'      => array(
             'id'    => 'email_user_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -479,53 +479,53 @@ 
 
         'email_user_note_header'    => array(
             'id'   => 'email_user_note_header',
-            'name' => '<h3>' . __( 'Customer Note', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when you add a customer note to an invoice/quote.', 'invoicing' ),
+            'name' => '<h3>' . __('Customer Note', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when you add a customer note to an invoice/quote.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_user_note_active'    => array(
             'id'   => 'email_user_note_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_user_note_admin_bcc' => array(
             'id'   => 'email_user_note_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_user_note_subject'   => array(
             'id'       => 'email_user_note_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_note_heading'   => array(
             'id'       => 'email_user_note_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'A note has been added to your {invoice_label}', 'invoicing' ),
+            'std'      => __('A note has been added to your {invoice_label}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_note_body'      => array(
             'id'    => 'email_user_note_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>The following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>The following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -535,63 +535,63 @@ 
 
         'email_overdue_header'    => array(
             'id'   => 'email_overdue_header',
-            'name' => '<h3>' . __( 'Payment Reminder', 'invoicing' ) . '</h3>',
-            'desc' => __( 'Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing' ),
+            'name' => '<h3>' . __('Payment Reminder', 'invoicing') . '</h3>',
+            'desc' => __('Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_overdue_active'    => array(
             'id'   => 'email_overdue_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_overdue_admin_bcc' => array(
             'id'   => 'email_overdue_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_overdue_days'      => array(
             'id'       => 'email_overdue_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like payment reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like payment reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1' ),
+            'std'      => array('1'),
             'type'     => 'multicheck',
             'options'  => $overdue_days_options,
         ),
 
         'email_overdue_subject'   => array(
             'id'       => 'email_overdue_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Payment Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Payment Reminder', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_overdue_heading'   => array(
             'id'       => 'email_overdue_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Payment reminder for your invoice', 'invoicing' ),
+            'std'      => __('Payment reminder for your invoice', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_overdue_body'      => array(
             'id'    => 'email_overdue_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -602,63 +602,63 @@ 
 
         'email_renewal_reminder_header'    => array(
             'id'   => 'email_renewal_reminder_header',
-            'name' => '<h3>' . __( 'Renewal Reminder', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers whenever their subscription is about to renew.', 'invoicing' ),
+            'name' => '<h3>' . __('Renewal Reminder', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers whenever their subscription is about to renew.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_renewal_reminder_active'    => array(
             'id'   => 'email_renewal_reminder_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_renewal_reminder_admin_bcc' => array(
             'id'   => 'email_renewal_reminder_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_renewal_reminder_days'      => array(
             'id'       => 'email_renewal_reminder_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like renewal reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like renewal reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1', '5', '10' ),
+            'std'      => array('1', '5', '10'),
             'type'     => 'multicheck',
             'options'  => $renewal_days_options,
         ),
 
         'email_renewal_reminder_subject'   => array(
             'id'       => 'email_renewal_reminder_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Renewal Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Renewal Reminder', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_renewal_reminder_heading'   => array(
             'id'       => 'email_renewal_reminder_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Upcoming renewal reminder', 'invoicing' ),
+            'std'      => __('Upcoming renewal reminder', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_renewal_reminder_body'      => array(
             'id'    => 'email_renewal_reminder_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -669,53 +669,53 @@ 
 
         'email_subscription_trial_header'    => array(
             'id'   => 'email_subscription_trial_header',
-            'name' => '<h3>' . __( 'Trial Started', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when a customer starts a subscription trial.', 'invoicing' ),
+            'name' => '<h3>' . __('Trial Started', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when a customer starts a subscription trial.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_trial_active'    => array(
             'id'   => 'email_subscription_trial_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_subscription_trial_admin_bcc' => array(
             'id'   => 'email_subscription_trial_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_subscription_trial_subject'   => array(
             'id'       => 'email_subscription_trial_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription trial email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription trial email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Trial Started', 'invoicing' ),
+            'std'      => __('[{site_title}] Trial Started', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_trial_heading'   => array(
             'id'       => 'email_subscription_trial_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Trial Started', 'invoicing' ),
+            'std'      => __('Trial Started', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_trial_body'      => array(
             'id'    => 'email_subscription_trial_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -725,53 +725,53 @@ 
 
         'email_subscription_cancelled_header'    => array(
             'id'   => 'email_subscription_cancelled_header',
-            'name' => '<h3>' . __( 'Subscription Cancelled', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when a customer cancels their subscription.', 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Cancelled', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when a customer cancels their subscription.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_cancelled_active'    => array(
             'id'   => 'email_subscription_cancelled_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_cancelled_admin_bcc' => array(
             'id'   => 'email_subscription_cancelled_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_cancelled_subject'   => array(
             'id'       => 'email_subscription_cancelled_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription cancelled email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription cancelled email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Cancelled', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_cancelled_heading'   => array(
             'id'       => 'email_subscription_cancelled_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Cancelled', 'invoicing' ),
+            'std'      => __('Subscription Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_cancelled_body'      => array(
             'id'    => 'email_subscription_cancelled_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -781,53 +781,53 @@ 
 
         'email_subscription_expired_header'    => array(
             'id'   => 'email_subscription_expired_header',
-            'name' => '<h3>' . __( 'Subscription Expired', 'invoicing' ) . '</h3>',
-            'desc' => __( "These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Expired', 'invoicing') . '</h3>',
+            'desc' => __("These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_expired_active'    => array(
             'id'   => 'email_subscription_expired_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_expired_admin_bcc' => array(
             'id'   => 'email_subscription_expired_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_expired_subject'   => array(
             'id'       => 'email_subscription_expired_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription expired email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription expired email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Expired', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Expired', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_expired_heading'   => array(
             'id'       => 'email_subscription_expired_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'type'     => 'text',
-            'std'      => __( 'Subscription Expired', 'invoicing' ),
+            'std'      => __('Subscription Expired', 'invoicing'),
             'help-tip' => true,
             'size'     => 'large',
         ),
 
         'email_subscription_expired_body'      => array(
             'id'    => 'email_subscription_expired_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -837,53 +837,53 @@ 
 
         'email_subscription_complete_header'    => array(
             'id'   => 'email_subscription_complete_header',
-            'name' => '<h3>' . __( 'Subscription Complete', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when a customer completes their subscription.', 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Complete', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when a customer completes their subscription.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_complete_active'    => array(
             'id'   => 'email_subscription_complete_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_complete_admin_bcc' => array(
             'id'   => 'email_subscription_complete_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_complete_subject'   => array(
             'id'       => 'email_subscription_complete_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription complete email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription complete email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Complete', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Complete', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_complete_heading'   => array(
             'id'       => 'email_subscription_complete_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Complete', 'invoicing' ),
+            'std'      => __('Subscription Complete', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_complete_body'      => array(
             'id'    => 'email_subscription_complete_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),

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>

Switch Indentation +48 added lines, -48 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /**
  * Template that prints a single subscription's details
@@ -10,19 +10,19 @@ 
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+    defined( 'ABSPATH' ) || exit;
 
-do_action( 'getpaid_single_subscription_before_notices', $subscription );
+    do_action( 'getpaid_single_subscription_before_notices', $subscription );
 
-// Display errors and notices.
-wpinv_print_errors();
+    // Display errors and notices.
+    wpinv_print_errors();
 
-$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
-$subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+    $subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
+    $subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
 
-do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
+    do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
 
-?>
+    ?>
 
 <h2 class="mb-1 h4"><?php esc_html_e( 'Subscription Details', 'invoicing' ); ?></h2>
 <table class="table table-bordered">
@@ -39,59 +39,59 @@ 
 				<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 );
 
 					?>

Spacing +40 added lines, -40 removed lines

@@ -10,58 +10,58 @@ 
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_single_subscription_before_notices', $subscription );
+do_action('getpaid_single_subscription_before_notices', $subscription);
 
 // Display errors and notices.
 wpinv_print_errors();
 
-$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
-$subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+$subscription_groups = getpaid_get_invoice_subscription_groups($subscription->get_parent_invoice_id());
+$subscription_group  = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
 
-do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
+do_action('getpaid_before_single_subscription', $subscription, $subscription_groups);
 
 ?>
 
-<h2 class="mb-1 h4"><?php esc_html_e( 'Subscription Details', 'invoicing' ); ?></h2>
+<h2 class="mb-1 h4"><?php esc_html_e('Subscription Details', 'invoicing'); ?></h2>
 <table class="table table-bordered">
 	<tbody>
 
-		<?php foreach ( $widget->get_single_subscription_columns( $subscription ) as $key => $label ) : ?>
+		<?php foreach ($widget->get_single_subscription_columns($subscription) as $key => $label) : ?>
 
-			<tr class="getpaid-subscription-meta-<?php echo esc_attr( $key ); ?>">
+			<tr class="getpaid-subscription-meta-<?php echo esc_attr($key); ?>">
 
 				<th class="font-weight-bold" style="width: 35%">
-					<?php echo esc_html( $label ); ?>
+					<?php echo esc_html($label); ?>
 				</th>
 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+						switch ($key) {
 
 						case 'status':
-							echo esc_html( $subscription->get_status_label() );
+							echo esc_html($subscription->get_status_label());
 							break;
 
 						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+							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() ) );
+							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() ) );
+							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() )
+									esc_html_x('( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing'),
+									esc_html($subscription->get_trial_period())
 								);
 								echo '</small>';
 
@@ -70,29 +70,29 @@ 
 							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>" ) );
+							$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() ) );
+							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 ) );
+								$markup = array_map(array('WPInv_Subscriptions_List_Table', 'generate_item_markup'), array_keys($subscription_group['items']));
+								echo wp_kses_post(implode(' | ', $markup));
 							}
 
 							break;
 
 						case 'payments':
 							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+							echo ((int) $subscription->get_times_billed()) . ' / ' . (empty($max_activations) ? '&infin;' : (int) $max_activations);
 
 							break;
 
 						}
-						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
+						do_action("getpaid_render_single_subscription_column_$key", $subscription);
 
 					?>
 				</td>
@@ -104,34 +104,34 @@ 
 	</tbody>
 </table>
 
-<?php if ( ! empty( $subscription_group ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Subscription Items', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_item_details_metabox( $subscription ); ?>
+<?php if (!empty($subscription_group)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Subscription Items', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_item_details_metabox($subscription); ?>
 <?php endif; ?>
 
-<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Related Invoices', 'invoicing' ); ?></h2>
+<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Related Invoices', 'invoicing'); ?></h2>
 
-<?php echo wp_kses_post( getpaid_admin_subscription_invoice_details_metabox( $subscription ) ); ?>
+<?php echo wp_kses_post(getpaid_admin_subscription_invoice_details_metabox($subscription)); ?>
 
-<?php if ( 1 < count( $subscription_groups ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Related Subscriptions', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_related_subscriptions_metabox( $subscription ); ?>
+<?php if (1 < count($subscription_groups)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Related Subscriptions', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_related_subscriptions_metabox($subscription); ?>
 <?php endif; ?>
 
 <span class="form-text">
 
 	<?php
-		if ( $subscription->can_cancel() ) {
+		if ($subscription->can_cancel()) {
 		printf(
             '<a href="%s" class="btn btn-danger btn-sm" onclick="return confirm(\'%s\')">%s</a>&nbsp;&nbsp;',
-            esc_url( $subscription->get_cancel_url() ),
-            esc_attr__( 'Are you sure you want to cancel this subscription?', 'invoicing' ),
-            esc_html__( 'Cancel Subscription', 'invoicing' )
+            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>
+	<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/gateways/class-getpaid-paypal-gateway-ipn-handler.php

Indentation +396 added lines, -396 removed lines

@@ -12,478 +12,478 @@
  */
 class GetPaid_Paypal_Gateway_IPN_Handler {
 
-	/**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
-	protected $id = 'paypal';
-
-	/**
-	 * Payment method object.
-	 *
-	 * @var GetPaid_Paypal_Gateway
-	 */
-	protected $gateway;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param GetPaid_Paypal_Gateway $gateway
-	 */
-	public function __construct( $gateway ) {
-		$this->gateway = $gateway;
-		$this->verify_ipn();
-	}
-
-	/**
-	 * Processes ipns and marks payments as complete.
-	 *
-	 * @return void
-	 */
-	public function verify_ipn() {
-
-		wpinv_error_log( 'GetPaid PayPal IPN Handler', false );
-
-		// Validate the IPN.
-		if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-			wp_die( 'PayPal IPN Request Failure', 500 );
-		}
-
-		// Process the IPN.
-		$posted  = wp_unslash( $_POST );
-		$invoice = $this->get_ipn_invoice( $posted );
-
-		// Abort if it was not paid by our gateway.
-		if ( $this->id != $invoice->get_gateway() ) {
-			wpinv_error_log( 'Aborting, Invoice was not paid via PayPal', false );
-			wp_die( 'Invoice not paid via PayPal', 200 );
-		}
-
-		$posted['payment_status'] = isset( $posted['payment_status'] ) ? sanitize_key( strtolower( $posted['payment_status'] ) ) : '';
-		$posted['txn_type']       = sanitize_key( strtolower( $posted['txn_type'] ) );
-
-		wpinv_error_log( 'Payment status:' . $posted['payment_status'], false );
-		wpinv_error_log( 'IPN Type:' . $posted['txn_type'], false );
-
-		if ( method_exists( $this, 'ipn_txn_' . $posted['txn_type'] ) ) {
-			call_user_func( array( $this, 'ipn_txn_' . $posted['txn_type'] ), $invoice, $posted );
-			wpinv_error_log( 'Done processing IPN', false );
-			wp_die( 'Processed', 200 );
-		}
-
-		wpinv_error_log( 'Aborting, Unsupported IPN type:' . $posted['txn_type'], false );
-		wp_die( 'Unsupported IPN type', 200 );
-
-	}
-
-	/**
-	 * Retrieves IPN Invoice.
-	 *
-	 * @param array $posted
-	 * @return WPInv_Invoice
-	 */
-	protected function get_ipn_invoice( $posted ) {
-
-		wpinv_error_log( 'Retrieving PayPal IPN Response Invoice', false );
-
-		if ( ! empty( $posted['custom'] ) ) {
-			$invoice = new WPInv_Invoice( $posted['custom'] );
-
-			if ( $invoice->exists() ) {
-				wpinv_error_log( 'Found invoice #' . $invoice->get_number(), false );
-				return $invoice;
-			}
-		}
-
-		wpinv_error_log( 'Could not retrieve the associated invoice.', false );
-		wp_die( 'Could not retrieve the associated invoice.', 200 );
-	}
-
-	/**
-	 * Check PayPal IPN validity.
-	 */
-	protected function validate_ipn() {
-
-		wpinv_error_log( 'Validating PayPal IPN response', false );
-
-		// Retrieve the associated invoice.
-		$posted  = wp_unslash( $_POST );
-		$invoice = $this->get_ipn_invoice( $posted );
-
-		if ( $this->gateway->is_sandbox( $invoice ) ) {
-			wpinv_error_log( $posted, 'Invoice was processed in sandbox hence logging the posted data', false );
-		}
-
-		// Validate the IPN.
-		$posted['cmd'] = '_notify-validate';
-
-		// Send back post vars to paypal.
-		$params = array(
-			'body'        => $posted,
-			'timeout'     => 60,
-			'httpversion' => '1.1',
-			'compress'    => false,
-			'decompress'  => false,
-			'user-agent'  => 'GetPaid/' . WPINV_VERSION,
-		);
-
-		// Post back to get a response.
-		$response = wp_safe_remote_post( $this->gateway->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr' : 'https://www.paypal.com/cgi-bin/webscr', $params );
-
-		// Check to see if the request was valid.
-		if ( ! is_wp_error( $response ) && $response['response']['code'] < 300 && strstr( $response['body'], 'VERIFIED' ) ) {
-			$invoice->add_note( 'Received valid response from PayPal IPN: ' . $response['body'], false, false, true );
-			wpinv_error_log( 'Received valid response from PayPal IPN: ' . $response['body'], false );
-			return true;
-		}
-
-		$invoice->add_note( 'IPN message:' . wp_json_encode( $posted ), false, false, true );
-
-		if ( is_wp_error( $response ) ) {
-			$invoice->add_note( 'Received invalid response from PayPal IPN: ' . $response->get_error_message(), false, false, true );
-			wpinv_error_log( $response->get_error_message(), 'Received invalid response from PayPal IPN' );
-			return false;
-		}
-
-		$invoice->add_note( 'Received invalid response from PayPal IPN: ' . $response['body'], false, false, true );
-		wpinv_error_log( $response['body'], 'Received invalid response from PayPal IPN' );
-		return false;
-
-	}
-
-	/**
-	 * Check currency from IPN matches the invoice.
-	 *
-	 * @param WPInv_Invoice $invoice          Invoice object.
-	 * @param string   $currency currency to validate.
-	 */
-	protected function validate_ipn_currency( $invoice, $currency ) {
+    /**
+     * Payment method id.
+     *
+     * @var string
+     */
+    protected $id = 'paypal';
+
+    /**
+     * Payment method object.
+     *
+     * @var GetPaid_Paypal_Gateway
+     */
+    protected $gateway;
+
+    /**
+     * Class constructor.
+     *
+     * @param GetPaid_Paypal_Gateway $gateway
+     */
+    public function __construct( $gateway ) {
+        $this->gateway = $gateway;
+        $this->verify_ipn();
+    }
+
+    /**
+     * Processes ipns and marks payments as complete.
+     *
+     * @return void
+     */
+    public function verify_ipn() {
+
+        wpinv_error_log( 'GetPaid PayPal IPN Handler', false );
+
+        // Validate the IPN.
+        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
+            wp_die( 'PayPal IPN Request Failure', 500 );
+        }
+
+        // Process the IPN.
+        $posted  = wp_unslash( $_POST );
+        $invoice = $this->get_ipn_invoice( $posted );
+
+        // Abort if it was not paid by our gateway.
+        if ( $this->id != $invoice->get_gateway() ) {
+            wpinv_error_log( 'Aborting, Invoice was not paid via PayPal', false );
+            wp_die( 'Invoice not paid via PayPal', 200 );
+        }
+
+        $posted['payment_status'] = isset( $posted['payment_status'] ) ? sanitize_key( strtolower( $posted['payment_status'] ) ) : '';
+        $posted['txn_type']       = sanitize_key( strtolower( $posted['txn_type'] ) );
+
+        wpinv_error_log( 'Payment status:' . $posted['payment_status'], false );
+        wpinv_error_log( 'IPN Type:' . $posted['txn_type'], false );
+
+        if ( method_exists( $this, 'ipn_txn_' . $posted['txn_type'] ) ) {
+            call_user_func( array( $this, 'ipn_txn_' . $posted['txn_type'] ), $invoice, $posted );
+            wpinv_error_log( 'Done processing IPN', false );
+            wp_die( 'Processed', 200 );
+        }
+
+        wpinv_error_log( 'Aborting, Unsupported IPN type:' . $posted['txn_type'], false );
+        wp_die( 'Unsupported IPN type', 200 );
+
+    }
+
+    /**
+     * Retrieves IPN Invoice.
+     *
+     * @param array $posted
+     * @return WPInv_Invoice
+     */
+    protected function get_ipn_invoice( $posted ) {
+
+        wpinv_error_log( 'Retrieving PayPal IPN Response Invoice', false );
+
+        if ( ! empty( $posted['custom'] ) ) {
+            $invoice = new WPInv_Invoice( $posted['custom'] );
+
+            if ( $invoice->exists() ) {
+                wpinv_error_log( 'Found invoice #' . $invoice->get_number(), false );
+                return $invoice;
+            }
+        }
+
+        wpinv_error_log( 'Could not retrieve the associated invoice.', false );
+        wp_die( 'Could not retrieve the associated invoice.', 200 );
+    }
+
+    /**
+     * Check PayPal IPN validity.
+     */
+    protected function validate_ipn() {
+
+        wpinv_error_log( 'Validating PayPal IPN response', false );
+
+        // Retrieve the associated invoice.
+        $posted  = wp_unslash( $_POST );
+        $invoice = $this->get_ipn_invoice( $posted );
+
+        if ( $this->gateway->is_sandbox( $invoice ) ) {
+            wpinv_error_log( $posted, 'Invoice was processed in sandbox hence logging the posted data', false );
+        }
+
+        // Validate the IPN.
+        $posted['cmd'] = '_notify-validate';
+
+        // Send back post vars to paypal.
+        $params = array(
+            'body'        => $posted,
+            'timeout'     => 60,
+            'httpversion' => '1.1',
+            'compress'    => false,
+            'decompress'  => false,
+            'user-agent'  => 'GetPaid/' . WPINV_VERSION,
+        );
+
+        // Post back to get a response.
+        $response = wp_safe_remote_post( $this->gateway->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr' : 'https://www.paypal.com/cgi-bin/webscr', $params );
+
+        // Check to see if the request was valid.
+        if ( ! is_wp_error( $response ) && $response['response']['code'] < 300 && strstr( $response['body'], 'VERIFIED' ) ) {
+            $invoice->add_note( 'Received valid response from PayPal IPN: ' . $response['body'], false, false, true );
+            wpinv_error_log( 'Received valid response from PayPal IPN: ' . $response['body'], false );
+            return true;
+        }
+
+        $invoice->add_note( 'IPN message:' . wp_json_encode( $posted ), false, false, true );
+
+        if ( is_wp_error( $response ) ) {
+            $invoice->add_note( 'Received invalid response from PayPal IPN: ' . $response->get_error_message(), false, false, true );
+            wpinv_error_log( $response->get_error_message(), 'Received invalid response from PayPal IPN' );
+            return false;
+        }
+
+        $invoice->add_note( 'Received invalid response from PayPal IPN: ' . $response['body'], false, false, true );
+        wpinv_error_log( $response['body'], 'Received invalid response from PayPal IPN' );
+        return false;
+
+    }
+
+    /**
+     * Check currency from IPN matches the invoice.
+     *
+     * @param WPInv_Invoice $invoice          Invoice object.
+     * @param string   $currency currency to validate.
+     */
+    protected function validate_ipn_currency( $invoice, $currency ) {
 
-		if ( strtolower( $invoice->get_currency() ) !== strtolower( $currency ) ) {
+        if ( strtolower( $invoice->get_currency() ) !== strtolower( $currency ) ) {
 
-			/* translators: %s: currency code. */
-			$invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal currencies do not match (code %s).', 'invoicing' ), $currency ) );
+            /* translators: %s: currency code. */
+            $invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal currencies do not match (code %s).', 'invoicing' ), $currency ) );
 
-			wpinv_error_log( "Currencies do not match: {$currency} instead of {$invoice->get_currency()}", 'IPN Error', __FILE__, __LINE__, true );
-		}
+            wpinv_error_log( "Currencies do not match: {$currency} instead of {$invoice->get_currency()}", 'IPN Error', __FILE__, __LINE__, true );
+        }
 
-		wpinv_error_log( $currency, 'Validated IPN Currency', false );
-	}
+        wpinv_error_log( $currency, 'Validated IPN Currency', false );
+    }
 
-	/**
-	 * Check payment amount from IPN matches the invoice.
-	 *
-	 * @param WPInv_Invoice $invoice          Invoice object.
-	 * @param float   $amount amount to validate.
-	 */
-	protected function validate_ipn_amount( $invoice, $amount ) {
-		if ( number_format( $invoice->get_total(), 2, '.', '' ) !== number_format( $amount, 2, '.', '' ) ) {
+    /**
+     * Check payment amount from IPN matches the invoice.
+     *
+     * @param WPInv_Invoice $invoice          Invoice object.
+     * @param float   $amount amount to validate.
+     */
+    protected function validate_ipn_amount( $invoice, $amount ) {
+        if ( number_format( $invoice->get_total(), 2, '.', '' ) !== number_format( $amount, 2, '.', '' ) ) {
 
-			/* translators: %s: Amount. */
-			$invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal amounts do not match (gross %s).', 'invoicing' ), $amount ) );
+            /* translators: %s: Amount. */
+            $invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal amounts do not match (gross %s).', 'invoicing' ), $amount ) );
 
-			wpinv_error_log( "Amounts do not match: {$amount} instead of {$invoice->get_total()}", 'IPN Error', __FILE__, __LINE__, true );
-		}
+            wpinv_error_log( "Amounts do not match: {$amount} instead of {$invoice->get_total()}", 'IPN Error', __FILE__, __LINE__, true );
+        }
 
-		wpinv_error_log( $amount, 'Validated IPN Amount', false );
-	}
+        wpinv_error_log( $amount, 'Validated IPN Amount', false );
+    }
 
-	/**
-	 * Verify receiver email from PayPal.
-	 *
-	 * @param WPInv_Invoice $invoice          Invoice object.
-	 * @param string   $receiver_email Email to validate.
-	 */
-	protected function validate_ipn_receiver_email( $invoice, $receiver_email ) {
-		$paypal_email = wpinv_get_option( 'paypal_email' );
+    /**
+     * Verify receiver email from PayPal.
+     *
+     * @param WPInv_Invoice $invoice          Invoice object.
+     * @param string   $receiver_email Email to validate.
+     */
+    protected function validate_ipn_receiver_email( $invoice, $receiver_email ) {
+        $paypal_email = wpinv_get_option( 'paypal_email' );
 
-		if ( $receiver_email && strcasecmp( trim( $receiver_email ), trim( $paypal_email ) ) !== 0 ) {
-			wpinv_record_gateway_error( 'IPN Error', "IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}" );
+        if ( $receiver_email && strcasecmp( trim( $receiver_email ), trim( $paypal_email ) ) !== 0 ) {
+            wpinv_record_gateway_error( 'IPN Error', "IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}" );
 
-			/* translators: %s: email address . */
-			$invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal IPN response from a different email address (%s).', 'invoicing' ), $receiver_email ) );
+            /* translators: %s: email address . */
+            $invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal IPN response from a different email address (%s).', 'invoicing' ), $receiver_email ) );
 
-			return wpinv_error_log( "IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}", 'IPN Error', __FILE__, __LINE__, true );
-		}
+            return wpinv_error_log( "IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}", 'IPN Error', __FILE__, __LINE__, true );
+        }
 
-		wpinv_error_log( 'Validated PayPal Email', false );
-	}
+        wpinv_error_log( 'Validated PayPal Email', false );
+    }
 
-	/**
-	 * Handles one time payments.
-	 *
-	 * @param WPInv_Invoice $invoice  Invoice object.
-	 * @param array    $posted Posted data.
-	 */
-	protected function ipn_txn_web_accept( $invoice, $posted ) {
+    /**
+     * Handles one time payments.
+     *
+     * @param WPInv_Invoice $invoice  Invoice object.
+     * @param array    $posted Posted data.
+     */
+    protected function ipn_txn_web_accept( $invoice, $posted ) {
 
-		// Collect payment details
-		$payment_status = strtolower( $posted['payment_status'] );
-		$business_email = isset( $posted['business'] ) && is_email( $posted['business'] ) ? trim( $posted['business'] ) : trim( $posted['receiver_email'] );
+        // Collect payment details
+        $payment_status = strtolower( $posted['payment_status'] );
+        $business_email = isset( $posted['business'] ) && is_email( $posted['business'] ) ? trim( $posted['business'] ) : trim( $posted['receiver_email'] );
 
-		$this->validate_ipn_receiver_email( $invoice, $business_email );
-		$this->validate_ipn_currency( $invoice, $posted['mc_currency'] );
+        $this->validate_ipn_receiver_email( $invoice, $business_email );
+        $this->validate_ipn_currency( $invoice, $posted['mc_currency'] );
 
-		// Update the transaction id.
-		if ( ! empty( $posted['txn_id'] ) ) {
-			$invoice->set_transaction_id( wpinv_clean( $posted['txn_id'] ) );
-			$invoice->save();
-		}
+        // Update the transaction id.
+        if ( ! empty( $posted['txn_id'] ) ) {
+            $invoice->set_transaction_id( wpinv_clean( $posted['txn_id'] ) );
+            $invoice->save();
+        }
 
-		$invoice->add_system_note( __( 'Processing invoice IPN', 'invoicing' ) );
+        $invoice->add_system_note( __( 'Processing invoice IPN', 'invoicing' ) );
 
-		// Process a refund.
-		if ( 'refunded' === $payment_status || 'reversed' === $payment_status ) {
+        // Process a refund.
+        if ( 'refunded' === $payment_status || 'reversed' === $payment_status ) {
 
-			update_post_meta( $invoice->get_id(), 'refunded_remotely', 1 );
+            update_post_meta( $invoice->get_id(), 'refunded_remotely', 1 );
 
-			if ( ! $invoice->is_refunded() ) {
-				$invoice->update_status( 'wpi-refunded', $posted['reason_code'] );
-			}
+            if ( ! $invoice->is_refunded() ) {
+                $invoice->update_status( 'wpi-refunded', $posted['reason_code'] );
+            }
 
-			return wpinv_error_log( $posted['reason_code'], false );
-		}
+            return wpinv_error_log( $posted['reason_code'], false );
+        }
 
-		// Process payments.
-		if ( 'completed' === $payment_status ) {
+        // Process payments.
+        if ( 'completed' === $payment_status ) {
 
-			if ( $invoice->is_paid() && 'wpi_processing' != $invoice->get_status() ) {
-				return wpinv_error_log( 'Aborting, Invoice #' . $invoice->get_number() . ' is already paid.', false );
-			}
+            if ( $invoice->is_paid() && 'wpi_processing' != $invoice->get_status() ) {
+                return wpinv_error_log( 'Aborting, Invoice #' . $invoice->get_number() . ' is already paid.', false );
+            }
 
-			$this->validate_ipn_amount( $invoice, $posted['mc_gross'] );
+            $this->validate_ipn_amount( $invoice, $posted['mc_gross'] );
 
-			$note = '';
+            $note = '';
 
-			if ( ! empty( $posted['mc_fee'] ) ) {
-				$note = sprintf( __( 'PayPal Transaction Fee %s.', 'invoicing' ), sanitize_text_field( $posted['mc_fee'] ) );
-			}
+            if ( ! empty( $posted['mc_fee'] ) ) {
+                $note = sprintf( __( 'PayPal Transaction Fee %s.', 'invoicing' ), sanitize_text_field( $posted['mc_fee'] ) );
+            }
 
-			if ( ! empty( $posted['payer_status'] ) ) {
-				$note = ' ' . sprintf( __( 'Buyer status %s.', 'invoicing' ), sanitize_text_field( $posted['payer_status'] ) );
-			}
+            if ( ! empty( $posted['payer_status'] ) ) {
+                $note = ' ' . sprintf( __( 'Buyer status %s.', 'invoicing' ), sanitize_text_field( $posted['payer_status'] ) );
+            }
 
-			$invoice->mark_paid( ( ! empty( $posted['txn_id'] ) ? sanitize_text_field( $posted['txn_id'] ) : '' ), trim( $note ) );
-			return wpinv_error_log( 'Invoice marked as paid.', false );
+            $invoice->mark_paid( ( ! empty( $posted['txn_id'] ) ? sanitize_text_field( $posted['txn_id'] ) : '' ), trim( $note ) );
+            return wpinv_error_log( 'Invoice marked as paid.', false );
 
-		}
+        }
 
-		// Pending payments.
-		if ( 'pending' === $payment_status ) {
+        // Pending payments.
+        if ( 'pending' === $payment_status ) {
 
-			/* translators: %s: pending reason. */
-			$invoice->update_status( 'wpi-onhold', sprintf( __( 'Payment pending (%s).', 'invoicing' ), $posted['pending_reason'] ) );
+            /* translators: %s: pending reason. */
+            $invoice->update_status( 'wpi-onhold', sprintf( __( 'Payment pending (%s).', 'invoicing' ), $posted['pending_reason'] ) );
 
-			return wpinv_error_log( 'Invoice marked as "payment held".', false );
-		}
+            return wpinv_error_log( 'Invoice marked as "payment held".', false );
+        }
 
-		/* translators: %s: payment status. */
-		$invoice->update_status( 'wpi-failed', sprintf( __( 'Payment %s via IPN.', 'invoicing' ), sanitize_text_field( $posted['payment_status'] ) ) );
+        /* translators: %s: payment status. */
+        $invoice->update_status( 'wpi-failed', sprintf( __( 'Payment %s via IPN.', 'invoicing' ), sanitize_text_field( $posted['payment_status'] ) ) );
 
-	}
+    }
 
-	/**
-	 * Handles one time payments.
-	 *
-	 * @param WPInv_Invoice $invoice  Invoice object.
-	 * @param array    $posted Posted data.
-	 */
-	protected function ipn_txn_cart( $invoice, $posted ) {
-		$this->ipn_txn_web_accept( $invoice, $posted );
-	}
+    /**
+     * Handles one time payments.
+     *
+     * @param WPInv_Invoice $invoice  Invoice object.
+     * @param array    $posted Posted data.
+     */
+    protected function ipn_txn_cart( $invoice, $posted ) {
+        $this->ipn_txn_web_accept( $invoice, $posted );
+    }
 
-	/**
-	 * Handles subscription sign ups.
-	 *
-	 * @param WPInv_Invoice $invoice  Invoice object.
-	 * @param array    $posted Posted data.
-	 */
-	protected function ipn_txn_subscr_signup( $invoice, $posted ) {
+    /**
+     * Handles subscription sign ups.
+     *
+     * @param WPInv_Invoice $invoice  Invoice object.
+     * @param array    $posted Posted data.
+     */
+    protected function ipn_txn_subscr_signup( $invoice, $posted ) {
 
-		wpinv_error_log( 'Processing subscription signup', false );
+        wpinv_error_log( 'Processing subscription signup', false );
 
-		// Make sure the invoice has a subscription.
-		$subscription = getpaid_get_invoice_subscription( $invoice );
+        // Make sure the invoice has a subscription.
+        $subscription = getpaid_get_invoice_subscription( $invoice );
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
-		}
+        if ( empty( $subscription ) ) {
+            return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+        }
 
-		wpinv_error_log( 'Found subscription #' . $subscription->get_id(), false );
+        wpinv_error_log( 'Found subscription #' . $subscription->get_id(), false );
 
-		// Validate the IPN.
-		$business_email = isset( $posted['business'] ) && is_email( $posted['business'] ) ? trim( $posted['business'] ) : trim( $posted['receiver_email'] );
-		$this->validate_ipn_receiver_email( $invoice, $business_email );
-		$this->validate_ipn_currency( $invoice, $posted['mc_currency'] );
+        // Validate the IPN.
+        $business_email = isset( $posted['business'] ) && is_email( $posted['business'] ) ? trim( $posted['business'] ) : trim( $posted['receiver_email'] );
+        $this->validate_ipn_receiver_email( $invoice, $business_email );
+        $this->validate_ipn_currency( $invoice, $posted['mc_currency'] );
 
-		// Activate the subscription.
-		$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-		$subscription->set_date_created( current_time( 'mysql' ) );
-		$subscription->set_expiration( date( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) ) );
-		$subscription->set_profile_id( sanitize_text_field( $posted['subscr_id'] ) );
-		$subscription->activate();
+        // Activate the subscription.
+        $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
+        $subscription->set_date_created( current_time( 'mysql' ) );
+        $subscription->set_expiration( date( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) ) );
+        $subscription->set_profile_id( sanitize_text_field( $posted['subscr_id'] ) );
+        $subscription->activate();
 
-		// Set the transaction id.
-		if ( ! empty( $posted['txn_id'] ) ) {
-			$invoice->add_note( sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ), $posted['txn_id'] ), false, false, true );
-			$invoice->set_transaction_id( $posted['txn_id'] );
-		}
+        // Set the transaction id.
+        if ( ! empty( $posted['txn_id'] ) ) {
+            $invoice->add_note( sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ), $posted['txn_id'] ), false, false, true );
+            $invoice->set_transaction_id( $posted['txn_id'] );
+        }
 
-		// Update the payment status.
-		$invoice->mark_paid();
+        // Update the payment status.
+        $invoice->mark_paid();
 
-		$invoice->add_note( sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ), $posted['subscr_id'] ), false, false, true );
+        $invoice->add_note( sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ), $posted['subscr_id'] ), false, false, true );
 
-		wpinv_error_log( 'Subscription started.', false );
-	}
+        wpinv_error_log( 'Subscription started.', false );
+    }
 
-	/**
-	 * Handles subscription renewals.
-	 *
-	 * @param WPInv_Invoice $invoice  Invoice object.
-	 * @param array    $posted Posted data.
-	 */
-	protected function ipn_txn_subscr_payment( $invoice, $posted ) {
+    /**
+     * Handles subscription renewals.
+     *
+     * @param WPInv_Invoice $invoice  Invoice object.
+     * @param array    $posted Posted data.
+     */
+    protected function ipn_txn_subscr_payment( $invoice, $posted ) {
 
-		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+        // Make sure the invoice has a subscription.
+        $subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
-		}
+        if ( empty( $subscription ) ) {
+            return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+        }
 
-		wpinv_error_log( 'Found subscription #' . $subscription->get_id(), false );
+        wpinv_error_log( 'Found subscription #' . $subscription->get_id(), false );
 
-		// PayPal sends a subscr_payment for the first payment too.
-		$date_completed = getpaid_format_date( $invoice->get_date_completed() );
-		$date_created   = getpaid_format_date( $invoice->get_date_created() );
-		$today_date     = getpaid_format_date( current_time( 'mysql' ) );
-		$payment_date   = getpaid_format_date( $posted['payment_date'] );
-		$subscribe_date = getpaid_format_date( $subscription->get_date_created() );
-		$dates          = array_filter( compact( 'date_completed', 'date_created', 'subscribe_date' ) );
+        // PayPal sends a subscr_payment for the first payment too.
+        $date_completed = getpaid_format_date( $invoice->get_date_completed() );
+        $date_created   = getpaid_format_date( $invoice->get_date_created() );
+        $today_date     = getpaid_format_date( current_time( 'mysql' ) );
+        $payment_date   = getpaid_format_date( $posted['payment_date'] );
+        $subscribe_date = getpaid_format_date( $subscription->get_date_created() );
+        $dates          = array_filter( compact( 'date_completed', 'date_created', 'subscribe_date' ) );
 
-		foreach ( $dates as $date ) {
+        foreach ( $dates as $date ) {
 
-			if ( $date !== $today_date && $date !== $payment_date ) {
-				continue;
-			}
+            if ( $date !== $today_date && $date !== $payment_date ) {
+                continue;
+            }
 
-			if ( ! empty( $posted['txn_id'] ) ) {
-				$invoice->set_transaction_id( sanitize_text_field( $posted['txn_id'] ) );
-				$invoice->add_note( wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ), sanitize_text_field( $posted['txn_id'] ) ), false, false, true );
-			}
+            if ( ! empty( $posted['txn_id'] ) ) {
+                $invoice->set_transaction_id( sanitize_text_field( $posted['txn_id'] ) );
+                $invoice->add_note( wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ), sanitize_text_field( $posted['txn_id'] ) ), false, false, true );
+            }
 
-			return $invoice->mark_paid();
-
-		}
+            return $invoice->mark_paid();
+
+        }
 
-		wpinv_error_log( 'Processing subscription renewal payment for the invoice ' . $invoice->get_id(), false );
-
-		// Abort if the payment is already recorded.
-		if ( wpinv_get_id_by_transaction_id( $posted['txn_id'] ) ) {
-			return wpinv_error_log( 'Aborting, Transaction ' . $posted['txn_id'] . ' has already been processed', false );
-		}
-
-		$args = array(
-			'transaction_id' => $posted['txn_id'],
-			'gateway'        => $this->id,
-		);
-
-		$invoice = wpinv_get_invoice( $subscription->add_payment( $args ) );
+        wpinv_error_log( 'Processing subscription renewal payment for the invoice ' . $invoice->get_id(), false );
+
+        // Abort if the payment is already recorded.
+        if ( wpinv_get_id_by_transaction_id( $posted['txn_id'] ) ) {
+            return wpinv_error_log( 'Aborting, Transaction ' . $posted['txn_id'] . ' has already been processed', false );
+        }
+
+        $args = array(
+            'transaction_id' => $posted['txn_id'],
+            'gateway'        => $this->id,
+        );
+
+        $invoice = wpinv_get_invoice( $subscription->add_payment( $args ) );
 
-		if ( empty( $invoice ) ) {
-			return;
-		}
+        if ( empty( $invoice ) ) {
+            return;
+        }
 
-		$invoice->add_note( wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ), $posted['txn_id'] ), false, false, true );
-		$invoice->add_note( wp_sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ), $posted['subscr_id'] ), false, false, true );
+        $invoice->add_note( wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ), $posted['txn_id'] ), false, false, true );
+        $invoice->add_note( wp_sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ), $posted['subscr_id'] ), false, false, true );
 
-		$subscription->renew();
-		wpinv_error_log( 'Subscription renewed.', false );
+        $subscription->renew();
+        wpinv_error_log( 'Subscription renewed.', false );
 
-	}
+    }
 
-	/**
-	 * Handles subscription cancelations.
-	 *
-	 * @param WPInv_Invoice $invoice  Invoice object.
-	 */
-	protected function ipn_txn_subscr_cancel( $invoice ) {
+    /**
+     * Handles subscription cancelations.
+     *
+     * @param WPInv_Invoice $invoice  Invoice object.
+     */
+    protected function ipn_txn_subscr_cancel( $invoice ) {
 
-		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
-
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
-		}
-
-		wpinv_error_log( 'Processing subscription cancellation for the invoice ' . $invoice->get_id(), false );
-		$subscription->cancel();
-		wpinv_error_log( 'Subscription cancelled.', false );
+        // Make sure the invoice has a subscription.
+        $subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+
+        if ( empty( $subscription ) ) {
+            return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+        }
+
+        wpinv_error_log( 'Processing subscription cancellation for the invoice ' . $invoice->get_id(), false );
+        $subscription->cancel();
+        wpinv_error_log( 'Subscription cancelled.', false );
 
-	}
+    }
 
-	/**
-	 * Handles subscription completions.
-	 *
-	 * @param WPInv_Invoice $invoice  Invoice object.
-	 * @param array    $posted Posted data.
-	 */
-	protected function ipn_txn_subscr_eot( $invoice ) {
+    /**
+     * Handles subscription completions.
+     *
+     * @param WPInv_Invoice $invoice  Invoice object.
+     * @param array    $posted Posted data.
+     */
+    protected function ipn_txn_subscr_eot( $invoice ) {
 
-		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+        // Make sure the invoice has a subscription.
+        $subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
-		}
+        if ( empty( $subscription ) ) {
+            return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+        }
 
-		wpinv_error_log( 'Processing subscription end of life for the invoice ' . $invoice->get_id(), false );
-		$subscription->complete();
-		wpinv_error_log( 'Subscription completed.', false );
+        wpinv_error_log( 'Processing subscription end of life for the invoice ' . $invoice->get_id(), false );
+        $subscription->complete();
+        wpinv_error_log( 'Subscription completed.', false );
 
-	}
+    }
 
-	/**
-	 * Handles subscription fails.
-	 *
-	 * @param WPInv_Invoice $invoice  Invoice object.
-	 * @param array    $posted Posted data.
-	 */
-	protected function ipn_txn_subscr_failed( $invoice ) {
+    /**
+     * Handles subscription fails.
+     *
+     * @param WPInv_Invoice $invoice  Invoice object.
+     * @param array    $posted Posted data.
+     */
+    protected function ipn_txn_subscr_failed( $invoice ) {
 
-		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+        // Make sure the invoice has a subscription.
+        $subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
-		}
+        if ( empty( $subscription ) ) {
+            return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+        }
 
-		wpinv_error_log( 'Processing subscription payment failure for the invoice ' . $invoice->get_id(), false );
-		$subscription->failing();
-		wpinv_error_log( 'Subscription marked as failing.', false );
+        wpinv_error_log( 'Processing subscription payment failure for the invoice ' . $invoice->get_id(), false );
+        $subscription->failing();
+        wpinv_error_log( 'Subscription marked as failing.', false );
 
-	}
+    }
 
-	/**
-	 * Handles subscription suspensions.
-	 *
-	 * @param WPInv_Invoice $invoice  Invoice object.
-	 * @param array    $posted Posted data.
-	 */
-	protected function ipn_txn_recurring_payment_suspended_due_to_max_failed_payment( $invoice ) {
+    /**
+     * Handles subscription suspensions.
+     *
+     * @param WPInv_Invoice $invoice  Invoice object.
+     * @param array    $posted Posted data.
+     */
+    protected function ipn_txn_recurring_payment_suspended_due_to_max_failed_payment( $invoice ) {
 
-		// Make sure the invoice has a subscription.
-		$subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
+        // Make sure the invoice has a subscription.
+        $subscription = getpaid_subscriptions()->get_invoice_subscription( $invoice );
 
-		if ( empty( $subscription ) ) {
-			return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
-		}
-
-		wpinv_error_log( 'Processing subscription cancellation due to max failed payment for the invoice ' . $invoice->get_id(), false );
-		$subscription->cancel();
-		wpinv_error_log( 'Subscription cancelled.', false );
-	}
+        if ( empty( $subscription ) ) {
+            return wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found', false );
+        }
+
+        wpinv_error_log( 'Processing subscription cancellation due to max failed payment for the invoice ' . $invoice->get_id(), false );
+        $subscription->cancel();
+        wpinv_error_log( 'Subscription cancelled.', false );
+    }
 
 }

Spacing +155 added lines, -155 removed lines

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