AyeCode / invoicing

includes/admin/wpinv-upgrade-functions.php

Spacing +50 added lines, -50 removed lines

@@ -11,55 +11,55 @@ 
  * @since 1.0.0
 */
 function wpinv_automatic_upgrade() {
-    $wpi_version = get_option( 'wpinv_version' );
+    $wpi_version = get_option('wpinv_version');
 
     // Update tables.
-    if ( ! get_option( 'getpaid_created_invoice_tables' ) ) {
+    if (!get_option('getpaid_created_invoice_tables')) {
         wpinv_v119_upgrades();
-        update_option( 'getpaid_created_invoice_tables', true );
+        update_option('getpaid_created_invoice_tables', true);
     }
 
-    if ( $wpi_version == WPINV_VERSION ) {
+    if ($wpi_version == WPINV_VERSION) {
         return;
     }
 
-    if ( version_compare( $wpi_version, '0.0.5', '<' ) ) {
+    if (version_compare($wpi_version, '0.0.5', '<')) {
         wpinv_v005_upgrades();
     }
 
-    if ( version_compare( $wpi_version, '1.0.3', '<' ) ) {
+    if (version_compare($wpi_version, '1.0.3', '<')) {
         wpinv_v110_upgrades();
     }
 
-    update_option( 'wpinv_version', WPINV_VERSION );
+    update_option('wpinv_version', WPINV_VERSION);
 }
-add_action( 'admin_init', 'wpinv_automatic_upgrade' );
+add_action('admin_init', 'wpinv_automatic_upgrade');
 
 function wpinv_v005_upgrades() {
     global $wpdb;
 
     // Invoices status
-    $results = $wpdb->get_results( "SELECT ID FROM " . $wpdb->posts . " WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+    $results = $wpdb->get_results("SELECT ID FROM " . $wpdb->posts . " WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
 
         // Clean post cache
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->ID );
+        foreach ($results as $row) {
+            clean_post_cache($row->ID);
         }
     }
 
     // Item meta key changes
     $query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-    $results = $wpdb->get_results( $query );
+    $results = $wpdb->get_results($query);
 
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
         
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->post_id );
+        foreach ($results as $row) {
+            clean_post_cache($row->post_id);
         }
     }
 
@@ -88,7 +88,7 @@ 
 function wpinv_create_invoices_table() {
     global $wpdb;
 
-    require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
     // Create invoices table.
     $table = $wpdb->prefix . 'getpaid_invoices';
@@ -132,7 +132,7 @@ 
             KEY `key` ( `key` )
             ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-    dbDelta( $sql );
+    dbDelta($sql);
 
     // Create invoice items table.
     $table = $wpdb->prefix . 'getpaid_invoice_items';
@@ -160,7 +160,7 @@ 
             KEY post_id ( post_id )
             ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-    dbDelta( $sql );
+    dbDelta($sql);
 }
 
 /**
@@ -172,29 +172,29 @@ 
     $invoices = array_unique(
         get_posts(
             array(
-                'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+                'post_type'      => array('wpi_invoice', 'wpi_quote'),
                 'posts_per_page' => -1,
                 'fields'         => 'ids',
-                'post_status'    => array_keys( wpinv_get_invoice_statuses( true ) ),
+                'post_status'    => array_keys(wpinv_get_invoice_statuses(true)),
             )
         )
     );
     $invoices_table = $wpdb->prefix . 'getpaid_invoices';
     $invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
 
-    if ( ! class_exists( 'WPInv_Legacy_Invoice' ) ) {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php' );
+    if (!class_exists('WPInv_Legacy_Invoice')) {
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php');
     }
 
     $invoice_rows = array();
-    foreach ( $invoices as $invoice ) {
+    foreach ($invoices as $invoice) {
 
-        $invoice = new WPInv_Legacy_Invoice( $invoice );
-        $fields = array (
+        $invoice = new WPInv_Legacy_Invoice($invoice);
+        $fields = array(
             'post_id'        => $invoice->ID,
             'number'         => $invoice->get_number(),
             'key'            => $invoice->get_key(),
-            'type'           => str_replace( 'wpi_', '', $invoice->post_type ),
+            'type'           => str_replace('wpi_', '', $invoice->post_type),
             'mode'           => $invoice->mode,
             'user_ip'        => $invoice->get_ip(),
             'first_name'     => $invoice->get_first_name(),
@@ -223,27 +223,27 @@ 
             'custom_meta'    => $invoice->payment_meta
         );
 
-        foreach ( $fields as $key => $val ) {
-            if ( is_null( $val ) ) {
+        foreach ($fields as $key => $val) {
+            if (is_null($val)) {
                 $val = '';
             }
-            $val = maybe_serialize( $val );
-            $fields[ $key ] = $wpdb->prepare( '%s', $val );
+            $val = maybe_serialize($val);
+            $fields[$key] = $wpdb->prepare('%s', $val);
         }
 
-        $fields = implode( ', ', $fields );
+        $fields = implode(', ', $fields);
         $invoice_rows[] = "($fields)";
 
         $item_rows    = array();
         $item_columns = array();
-        foreach ( $invoice->get_cart_details() as $details ) {
+        foreach ($invoice->get_cart_details() as $details) {
             $fields = array(
                 'post_id'          => $invoice->ID,
                 'item_id'          => $details['id'],
                 'item_name'        => $details['name'],
-                'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+                'item_description' => empty($details['meta']['description']) ? '' : $details['meta']['description'],
                 'vat_rate'         => $details['vat_rate'],
-                'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+                'vat_class'        => empty($details['vat_class']) ? '_standard' : $details['vat_class'],
                 'tax'              => $details['tax'],
                 'item_price'       => $details['item_price'],
                 'custom_price'     => $details['custom_price'],
@@ -255,26 +255,26 @@ 
                 'fees'             => $details['fees'],
             );
 
-            $item_columns = array_keys ( $fields );
+            $item_columns = array_keys($fields);
 
-            foreach ( $fields as $key => $val ) {
-                if ( is_null( $val ) ) {
+            foreach ($fields as $key => $val) {
+                if (is_null($val)) {
                     $val = '';
                 }
-                $val = maybe_serialize( $val );
-                $fields[ $key ] = $wpdb->prepare( '%s', $val );
+                $val = maybe_serialize($val);
+                $fields[$key] = $wpdb->prepare('%s', $val);
             }
 
-            $fields = implode( ', ', $fields );
+            $fields = implode(', ', $fields);
             $item_rows[] = "($fields)";
         }
 
-        $item_rows    = implode( ', ', $item_rows );
-        $item_columns = implode( ', ', $item_columns );
-        $wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
+        $item_rows    = implode(', ', $item_rows);
+        $item_columns = implode(', ', $item_columns);
+        $wpdb->query("INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows");
     }
 
-    $invoice_rows = implode( ', ', $invoice_rows );
-    $wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+    $invoice_rows = implode(', ', $invoice_rows);
+    $wpdb->query("INSERT INTO $invoices_table VALUES $invoice_rows");
 
 }

includes/subscription-functions.php

Spacing +71 added lines, -71 removed lines

@@ -15,26 +15,26 @@ 
  *
  * @return int|array|WPInv_Subscription[]|GetPaid_Subscriptions_Query
  */
-function getpaid_get_subscriptions( $args = array(), $return = 'results' ) {
+function getpaid_get_subscriptions($args = array(), $return = 'results') {
 
 	// Do not retrieve all fields if we just want the count.
-	if ( 'count' == $return ) {
+	if ('count' == $return) {
 		$args['fields'] = 'id';
 		$args['number'] = 1;
 	}
 
 	// Do not count all matches if we just want the results.
-	if ( 'results' == $return ) {
+	if ('results' == $return) {
 		$args['count_total'] = false;
 	}
 
-	$query = new GetPaid_Subscriptions_Query( $args );
+	$query = new GetPaid_Subscriptions_Query($args);
 
-	if ( 'results' == $return ) {
+	if ('results' == $return) {
 		return $query->get_results();
 	}
 
-	if ( 'count' == $return ) {
+	if ('count' == $return) {
 		return $query->get_total();
 	}
 
@@ -51,13 +51,13 @@ 
 	return apply_filters(
 		'getpaid_get_subscription_statuses',
 		array(
-			'pending'    => __( 'Pending', 'invoicing' ),
-			'trialling'  => __( 'Trialing', 'invoicing' ),
-			'active'     => __( 'Active', 'invoicing' ),
-			'failing'    => __( 'Failing', 'invoicing' ),
-			'expired'    => __( 'Expired', 'invoicing' ),
-			'completed'  => __( 'Complete', 'invoicing' ),
-			'cancelled'  => __( 'Cancelled', 'invoicing' ),
+			'pending'    => __('Pending', 'invoicing'),
+			'trialling'  => __('Trialing', 'invoicing'),
+			'active'     => __('Active', 'invoicing'),
+			'failing'    => __('Failing', 'invoicing'),
+			'expired'    => __('Expired', 'invoicing'),
+			'completed'  => __('Complete', 'invoicing'),
+			'cancelled'  => __('Cancelled', 'invoicing'),
 		)
 	);
 
@@ -68,9 +68,9 @@ 
  *
  * @return string
  */
-function getpaid_get_subscription_status_label( $status ) {
+function getpaid_get_subscription_status_label($status) {
 	$statuses = getpaid_get_subscription_statuses();
-	return isset( $statuses[ $status ] ) ? $statuses[ $status ] : ucfirst( sanitize_text_field( $status ) );
+	return isset($statuses[$status]) ? $statuses[$status] : ucfirst(sanitize_text_field($status));
 }
 
 /**
@@ -100,14 +100,14 @@ 
  *
  * @return array
  */
-function getpaid_get_subscription_status_counts( $args = array() ) {
+function getpaid_get_subscription_status_counts($args = array()) {
 
-	$statuses = array_keys( getpaid_get_subscription_statuses() );
+	$statuses = array_keys(getpaid_get_subscription_statuses());
 	$counts   = array();
 
-	foreach ( $statuses as $status ) {
-		$_args             = wp_parse_args( "status=$status", $args );
-		$counts[ $status ] = getpaid_get_subscriptions( $_args, 'count' );
+	foreach ($statuses as $status) {
+		$_args             = wp_parse_args("status=$status", $args);
+		$counts[$status] = getpaid_get_subscriptions($_args, 'count');
 	}
 
 	return $counts;
@@ -126,23 +126,23 @@ 
 		array(
 
 			'day'   => array(
-				'singular' => __( '%s day', 'invoicing' ),
-				'plural'   => __( '%d days', 'invoicing' ),
+				'singular' => __('%s day', 'invoicing'),
+				'plural'   => __('%d days', 'invoicing'),
 			),
 
 			'week'   => array(
-				'singular' => __( '%s week', 'invoicing' ),
-				'plural'   => __( '%d weeks', 'invoicing' ),
+				'singular' => __('%s week', 'invoicing'),
+				'plural'   => __('%d weeks', 'invoicing'),
 			),
 
 			'month'   => array(
-				'singular' => __( '%s month', 'invoicing' ),
-				'plural'   => __( '%d months', 'invoicing' ),
+				'singular' => __('%s month', 'invoicing'),
+				'plural'   => __('%d months', 'invoicing'),
 			),
 
 			'year'   => array(
-				'singular' => __( '%s year', 'invoicing' ),
-				'plural'   => __( '%d years', 'invoicing' ),
+				'singular' => __('%s year', 'invoicing'),
+				'plural'   => __('%d years', 'invoicing'),
 			),
 
 		)
@@ -156,8 +156,8 @@ 
  * @param string $trial_period
  * @return int
  */
-function getpaid_get_subscription_trial_period_interval( $trial_period ) {
-	return (int) preg_replace( '/[^0-9]/', '', $trial_period );
+function getpaid_get_subscription_trial_period_interval($trial_period) {
+	return (int) preg_replace('/[^0-9]/', '', $trial_period);
 }
 
 /**
@@ -166,8 +166,8 @@ 
  * @param string $trial_period
  * @return string
  */
-function getpaid_get_subscription_trial_period_period( $trial_period ) {
-	return preg_replace( '/[^a-z]/', '', strtolower( $trial_period ) );
+function getpaid_get_subscription_trial_period_period($trial_period) {
+	return preg_replace('/[^a-z]/', '', strtolower($trial_period));
 }
 
 /**
@@ -177,9 +177,9 @@ 
  * @param int $interval
  * @return string
  */
-function getpaid_get_subscription_period_label( $period, $interval = 1, $singular_prefix = '1' ) {
-	$label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label(  $period, $interval ) : getpaid_get_singular_subscription_period_label( $period, $singular_prefix );
-	return strtolower( sanitize_text_field( $label ) );
+function getpaid_get_subscription_period_label($period, $interval = 1, $singular_prefix = '1') {
+	$label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label($period, $interval) : getpaid_get_singular_subscription_period_label($period, $singular_prefix);
+	return strtolower(sanitize_text_field($label));
 }
 
 /**
@@ -188,19 +188,19 @@ 
  * @param string $period
  * @return string
  */
-function getpaid_get_singular_subscription_period_label( $period, $singular_prefix = '1' ) {
+function getpaid_get_singular_subscription_period_label($period, $singular_prefix = '1') {
 
 	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+	$period  = strtolower($period);
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['singular'], $singular_prefix );
+	if (isset($periods[$period])) {
+		return sprintf($periods[$period]['singular'], $singular_prefix);
 	}
 
 	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['singular'], $singular_prefix );
+	foreach ($periods as $key => $data) {
+		if (strpos($key, $period) === 0) {
+			return sprintf($data['singular'], $singular_prefix);
 		}
 	}
 
@@ -215,19 +215,19 @@ 
  * @param int $interval
  * @return string
  */
-function getpaid_get_plural_subscription_period_label( $period, $interval ) {
+function getpaid_get_plural_subscription_period_label($period, $interval) {
 
 	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+	$period  = strtolower($period);
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['plural'], $interval );
+	if (isset($periods[$period])) {
+		return sprintf($periods[$period]['plural'], $interval);
 	}
 
 	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['plural'], $interval );
+	foreach ($periods as $key => $data) {
+		if (strpos($key, $period) === 0) {
+			return sprintf($data['plural'], $interval);
 		}
 	}
 
@@ -241,23 +241,23 @@ 
  * @param WPInv_Subscription $subscription
  * @return string
  */
-function getpaid_get_formatted_subscription_amount( $subscription ) {
+function getpaid_get_formatted_subscription_amount($subscription) {
 
-	$initial   = wpinv_price( wpinv_format_amount( $subscription->get_initial_amount() ), $subscription->get_parent_payment()->get_currency() );
-	$recurring = wpinv_price( wpinv_format_amount( $subscription->get_recurring_amount() ), $subscription->get_parent_payment()->get_currency() );
-	$period    = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+	$initial   = wpinv_price(wpinv_format_amount($subscription->get_initial_amount()), $subscription->get_parent_payment()->get_currency());
+	$recurring = wpinv_price(wpinv_format_amount($subscription->get_recurring_amount()), $subscription->get_parent_payment()->get_currency());
+	$period    = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
 
 	// Trial periods.
-	if ( $subscription->has_trial_period() ) {
+	if ($subscription->has_trial_period()) {
 
-		$trial_period   = getpaid_get_subscription_trial_period_period( $subscription->get_trial_period() );
-		$trial_interval = getpaid_get_subscription_trial_period_interval( $subscription->get_trial_period() );
+		$trial_period   = getpaid_get_subscription_trial_period_period($subscription->get_trial_period());
+		$trial_interval = getpaid_get_subscription_trial_period_interval($subscription->get_trial_period());
 		return sprintf(
 
 			// translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period
-			_x( '%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing' ),
+			_x('%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing'),
 			$initial,
-			getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
+			getpaid_get_subscription_period_label($trial_period, $trial_interval),
 			$recurring,
 			$period
 
@@ -265,12 +265,12 @@ 
 
 	}
 
-	if ( $initial != $recurring ) {
+	if ($initial != $recurring) {
 
 		return sprintf(
 
 			// translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period
-			_x( 'Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing' ),
+			_x('Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing'),
 			$initial,
 			$recurring,
 			$period
@@ -282,7 +282,7 @@ 
 	return sprintf(
 
 		// translators: $1: is the recurring amount, $2: is the recurring period
-		_x( '%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing' ),
+		_x('%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing'),
 		$initial,
 		$period
 
@@ -296,8 +296,8 @@ 
  * @param WPInv_Invoice $invoice
  * @return WPInv_Subscription|bool
  */
-function getpaid_get_invoice_subscription( $invoice ) {
-	return getpaid_subscriptions()->get_invoice_subscription( $invoice );
+function getpaid_get_invoice_subscription($invoice) {
+	return getpaid_subscriptions()->get_invoice_subscription($invoice);
 }
 
 /**
@@ -305,9 +305,9 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_activate_invoice_subscription( $invoice ) {
-	$subscription = getpaid_get_invoice_subscription( $invoice );
-	if ( is_a( $subscription, 'WPInv_Subscription' ) ) {
+function getpaid_activate_invoice_subscription($invoice) {
+	$subscription = getpaid_get_invoice_subscription($invoice);
+	if (is_a($subscription, 'WPInv_Subscription')) {
 		$subscription->activate();
 	}
 }
@@ -318,7 +318,7 @@ 
  * @return WPInv_Subscriptions
  */
 function getpaid_subscriptions() {
-	return getpaid()->get( 'subscriptions' );
+	return getpaid()->get('subscriptions');
 }
 
 /**
@@ -326,13 +326,13 @@ 
  *
  * @return WPInv_Subscription|bool
  */
-function wpinv_get_subscription( $invoice ) {
+function wpinv_get_subscription($invoice) {
 
     // Retrieve the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Ensure it is a recurring invoice.
-    if ( ! $invoice->is_recurring() ) {
+    if (!$invoice->is_recurring()) {
         return false;
     }
 
@@ -344,6 +344,6 @@ 
 		)
 	);
 
-	return empty( $subscription ) ? false : $subscription[0];
+	return empty($subscription) ? false : $subscription[0];
 
 }

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

Spacing +11 added lines, -11 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' );
+    protected $supports = array('subscription');
 
     /**
 	 * Payment method order.
@@ -39,10 +39,10 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title        = __( 'Manual Payment', 'invoicing' );
-        $this->method_title = __( 'Manual Payment', 'invoicing' );
+        $this->title        = __('Manual Payment', 'invoicing');
+        $this->method_title = __('Manual Payment', 'invoicing');
 
-        add_filter( 'getpaid_daily_maintenance_should_expire_subscription', array( $this, 'maybe_renew_subscription' ), 10, 2 );
+        add_filter('getpaid_daily_maintenance_should_expire_subscription', array($this, 'maybe_renew_subscription'), 10, 2);
     }
 
     /**
@@ -54,16 +54,16 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Mark it as paid.
         $invoice->mark_paid();
 
         // (Maybe) activate subscription.
-        getpaid_activate_invoice_subscription( $invoice );
+        getpaid_activate_invoice_subscription($invoice);
 
         // 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()));
 
     }
 
@@ -74,15 +74,15 @@ 
 	 * @param bool $should_expire
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $should_expire, $subscription ) {
+	public function maybe_renew_subscription($should_expire, $subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( 'manual' != $subscription->get_gateway() || ! $subscription->has_status( 'active trialling' ) ) {
+        if ('manual' != $subscription->get_gateway() || !$subscription->has_status('active trialling')) {
             return $should_expire;
         }
 
         // If this is the last renewal, complete the subscription.
-        if ( $subscription->is_last_renewal() ) {
+        if ($subscription->is_last_renewal()) {
             $subscription->complete();
             return false;
         }

includes/class-getpaid-notification-email.php

Spacing +30 added lines, -30 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Represents a single email type.
@@ -32,7 +32,7 @@ 
      * @param string $id Email Type.
      * @param mixed $object Optional. Associated object.
 	 */
-	public function __construct( $id, $object = false ) {
+	public function __construct($id, $object = false) {
         $this->id     = $id;
         $this->object = $object;
     }
@@ -42,18 +42,18 @@ 
 	 *
      * @return mixed
 	 */
-	public function get_option( $key ) {
+	public function get_option($key) {
 
         $key   = "email_{$this->id}_$key";
-        $value = wpinv_get_option( $key, null );
-        if ( is_null( $value ) ) {
+        $value = wpinv_get_option($key, null);
+        if (is_null($value)) {
             $options = wpinv_get_emails();
 
-            if ( ! isset( $options[ $this->id ] ) || ! isset( $options[ $this->id ][ $key ] ) ) {
+            if (!isset($options[$this->id]) || !isset($options[$this->id][$key])) {
                 return '';
             }
 
-            $value = isset( $options[ $this->id ][ $key ]['std'] ) ? $options[ $this->id ][ $key ]['std'] : '';
+            $value = isset($options[$this->id][$key]['std']) ? $options[$this->id][$key]['std'] : '';
         }
 
         return $value;
@@ -65,8 +65,8 @@ 
      * @return string
 	 */
 	public function get_body() {
-        $body = $this->get_option( 'body' );
-        return apply_filters( 'getpaid_get_email_body', $body, $this->id, $this->object );
+        $body = $this->get_option('body');
+        return apply_filters('getpaid_get_email_body', $body, $this->id, $this->object);
     }
 
     /**
@@ -75,8 +75,8 @@ 
      * @return string
 	 */
 	public function get_subject() {
-        $subject = $this->get_option( 'subject' );
-        return apply_filters( 'getpaid_get_email_subject', $subject, $this->id, $this->object );
+        $subject = $this->get_option('subject');
+        return apply_filters('getpaid_get_email_subject', $subject, $this->id, $this->object);
     }
 
     /**
@@ -85,8 +85,8 @@ 
      * @return string
 	 */
 	public function get_heading() {
-        $heading = $this->get_option( 'heading' );
-        return apply_filters( 'getpaid_get_email_heading', $heading, $this->id, $this->object );
+        $heading = $this->get_option('heading');
+        return apply_filters('getpaid_get_email_heading', $heading, $this->id, $this->object);
     }
 
     /**
@@ -95,8 +95,8 @@ 
      * @return bool
 	 */
 	public function is_active() {
-        $is_active = ! empty( $this->get_option( 'active' ) );
-        return apply_filters( 'getpaid_email_type_is_active', $is_active, $this->id, $this->object );
+        $is_active = !empty($this->get_option('active'));
+        return apply_filters('getpaid_email_type_is_active', $is_active, $this->id, $this->object);
     }
 
     /**
@@ -105,8 +105,8 @@ 
      * @return bool
 	 */
 	public function include_admin_bcc() {
-        $include_admin_bcc = ! empty( $this->get_option( 'admin_bcc' ) );
-        return apply_filters( 'getpaid_email_type_include_admin_bcc', $include_admin_bcc, $this->id, $this->object );
+        $include_admin_bcc = !empty($this->get_option('admin_bcc'));
+        return apply_filters('getpaid_email_type_include_admin_bcc', $include_admin_bcc, $this->id, $this->object);
     }
 
     /**
@@ -115,8 +115,8 @@ 
      * @return bool
 	 */
 	public function is_admin_email() {
-        $is_admin_email = in_array( $this->id, array( 'new_invoice', 'cancelled_invoice', 'failed_invoice' ) );
-        return apply_filters( 'getpaid_email_type_is_admin_email', $is_admin_email, $this->id, $this->object );
+        $is_admin_email = in_array($this->id, array('new_invoice', 'cancelled_invoice', 'failed_invoice'));
+        return apply_filters('getpaid_email_type_is_admin_email', $is_admin_email, $this->id, $this->object);
     }
 
     /**
@@ -125,7 +125,7 @@ 
      * @return array
 	 */
 	public function get_attachments() {
-        return apply_filters( 'getpaid_get_email_attachments', array(), $this->id, $this->object );
+        return apply_filters('getpaid_get_email_attachments', array(), $this->id, $this->object);
     }
 
     /**
@@ -137,10 +137,10 @@ 
 
         $merge_tags = array(
             '{site_title}' => wpinv_get_blogname(),
-            '{date}'       => getpaid_format_date_value( current_time( 'mysql' ) ),
+            '{date}'       => getpaid_format_date_value(current_time('mysql')),
         );
 
-        return apply_filters( 'getpaid_get_email_merge_tags', $merge_tags, $this->object, $this->id );
+        return apply_filters('getpaid_get_email_merge_tags', $merge_tags, $this->object, $this->id);
     }
 
     /**
@@ -150,13 +150,13 @@ 
      * @param array $merge_tags
      * @return string
 	 */
-	public function add_merge_tags( $text, $merge_tags = array() ) {
+	public function add_merge_tags($text, $merge_tags = array()) {
 
-        foreach ( $merge_tags as $key => $value ) {
-            $text = str_replace( $key, $value, $text );
+        foreach ($merge_tags as $key => $value) {
+            $text = str_replace($key, $value, $text);
         }
 
-        return wptexturize( $text );
+        return wptexturize($text);
     }
 
     /**
@@ -166,7 +166,7 @@ 
      * @param array $extra_args Extra template args
      * @return string
 	 */
-	public function get_content( $merge_tags = array(), $extra_args = array() ) {
+	public function get_content($merge_tags = array(), $extra_args = array()) {
 
         $content = wpinv_get_template_html(
             "emails/wpinv-email-{$this->id}.php",
@@ -176,15 +176,15 @@ 
                     'invoice'       => $this->object, // Backwards compat.
                     'object'        => $this->object,
                     'email_type'    => $this->id,
-                    'email_heading' => $this->add_merge_tags( $this->get_heading(), $merge_tags ),
+                    'email_heading' => $this->add_merge_tags($this->get_heading(), $merge_tags),
                     'sent_to_admin' => $this->is_admin_email(),
                     'plain_text'    => false,
-                    'message_body'  => wpautop( $this->add_merge_tags( $this->get_body(), $merge_tags ) ),
+                    'message_body'  => wpautop($this->add_merge_tags($this->get_body(), $merge_tags)),
                 )
             )
         );
 
-        return wpinv_email_style_body( $content );
+        return wpinv_email_style_body($content);
     }
 
 }

includes/data/email-settings.php

Spacing +236 added lines, -236 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 <= 10; $i++ ) {
-    $overdue_days_options["$i"] = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
+for ($i = 2; $i <= 10; $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 <= 10; $i++ ) {
-    $renewal_days_options["$i"]   = wp_sprintf( __( '%d days before the renewal date', 'invoicing' ), $i );
+for ($i = 2; $i <= 10; $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}] We sent your invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing' ),
+            'std'      => __('[{site_title}] We sent your 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'      => __( 'Invoice sent', 'invoicing' ),
+            'std'      => __('Invoice sent', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_new_invoice_body' => array(
             'id'       => 'email_new_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>We sent your invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency}.</p>', 'invoicing' ),
+            'std'      => __('<p>We sent your invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency}.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -82,45 +82,45 @@ 
 
         'email_cancelled_invoice_header' => array(
             'id'       => 'email_cancelled_invoice_header',
-            'name'     => '<h3>' . __( 'Cancelled Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to the site admin whenever invoices are cancelled.', 'invoicing' ),
+            'name'     => '<h3>' . __('Cancelled Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to the site admin 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_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}] Cancelled invoice ({invoice_number})', 'invoicing' ),
+            'std'      => __('[{site_title}] Cancelled invoice ({invoice_number})', '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'      => __( 'Cancelled Invoice', 'invoicing' ),
+            'std'      => __('Cancelled Invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_cancelled_invoice_body' => array(
             'id'       => 'email_cancelled_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled.</p>', 'invoicing' ),
+            'std'      => __('<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -131,45 +131,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}] Failed invoice ({invoice_number})', 'invoicing' ),
+            'std'      => __('[{site_title}] Failed invoice ({invoice_number})', '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'      => __( 'Failed invoice', 'invoicing' ),
+            'std'      => __('Failed invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_failed_invoice_body' => array(
             'id'       => 'email_failed_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through.</p>', 'invoicing' ),
+            'std'      => __('<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -179,53 +179,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 receipt from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice receipt from {invoice_date}', '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'      => __( 'Thank you for your invoice', 'invoicing' ),
+            'std'      => __('Thank you for your invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_onhold_invoice_body' => array(
             'id'       => 'email_onhold_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -236,53 +236,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 invoice receipt from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice receipt from {invoice_date}', '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'      => __( 'Thank you for your invoice', 'invoicing' ),
+            'std'      => __('Thank you for your invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_processing_invoice_body' => array(
             'id'       => 'email_processing_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
             '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}.</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}.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -293,61 +293,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' ),
-            'desc'     => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -358,53 +358,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' ),
-            'desc'     => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -415,53 +415,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' ),
-            'desc'     => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
             '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'
         ),
@@ -471,53 +471,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' ),
-            'desc'     => __( 'The content of the email (wildcards and HTML are allowed).', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email (wildcards and HTML are allowed).', 'invoicing'),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Following note has been added to your {invoice_label}:</p><blockquote class="wpinv-note">{customer_note}</blockquote>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Following note has been added to your {invoice_label}:</p><blockquote class="wpinv-note">{customer_note}</blockquote>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -528,63 +528,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' ),
-            'desc'     => __( 'The content of the email.', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email.', 'invoicing'),
             '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,
         ),
@@ -595,63 +595,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 expire.', 'invoicing' ),
+            'name'     => '<h3>' . __('Renewal Reminder', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers whenever their subscription is about to expire.', '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'     => __( 'The content of the email.', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email.', 'invoicing'),
             '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,
         ),
@@ -662,53 +662,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_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_trial_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => __( 'The content of the email.', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email.', 'invoicing'),
             '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,
         ),
@@ -718,53 +718,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_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_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 Cancelled', 'invoicing' ),
+            'std'      => __('Subscription Cancelled', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_cancelled_body' => array(
             'id'       => 'email_cancelled_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => __( 'The content of the email.', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email.', 'invoicing'),
             '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,
         ),
@@ -774,53 +774,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_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_expired_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => __( 'The content of the email.', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email.', 'invoicing'),
             '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,
         ),
@@ -830,53 +830,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_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_complete_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => __( 'The content of the email.', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => __('The content of the email.', 'invoicing'),
             '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,
         ),

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

Spacing +9 added lines, -9 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -19,16 +19,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_details_metabox( /** @scrutinizer ignore-type */$subscription );
+        getpaid_admin_subscription_details_metabox(/** @scrutinizer ignore-type */$subscription);
         echo '</div>';
 
     }
@@ -38,16 +38,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output_invoices( $post ) {
+    public static function output_invoices($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_invoice_details_metabox( /** @scrutinizer ignore-type */$subscription );
+        getpaid_admin_subscription_invoice_details_metabox(/** @scrutinizer ignore-type */$subscription);
         echo '</div>';
 
     }

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

Spacing +63 added lines, -63 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles subscription notificaiton emails.
@@ -45,21 +45,21 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
-		foreach ( $this->subscription_actions as $hook => $email_type ) {
+		add_filter('getpaid_get_email_merge_tags', array($this, 'subscription_merge_tags'), 10, 2);
+		foreach ($this->subscription_actions as $hook => $email_type) {
 
-			$email = new GetPaid_Notification_Email( $email_type );
+			$email = new GetPaid_Notification_Email($email_type);
 
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $email_type ) ) {
-				add_action( $hook, array( $this, $email_type ), 100, 2 );
+			if (method_exists($this, $email_type)) {
+				add_action($hook, array($this, $email_type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_subscription_notification_email_register_hook', $email );
+			do_action('getpaid_subscription_notification_email_register_hook', $email);
 
 		}
 
@@ -71,12 +71,12 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function subscription_merge_tags( $merge_tags, $object ) {
+	public function subscription_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			$merge_tags = array_merge(
 				$merge_tags,
-				$this->get_subscription_merge_tags( $object )
+				$this->get_subscription_merge_tags($object)
 			);
 		}
 
@@ -90,25 +90,25 @@ 
 	 * @param WPInv_Subscription $subscription
 	 * @return array
 	 */
-	public function get_subscription_merge_tags( $subscription ) {
+	public function get_subscription_merge_tags($subscription) {
 
 		// Abort if it does not exist.
-		if ( ! $subscription->get_id() ) {
+		if (!$subscription->get_id()) {
 			return array();
 		}
 
-		$invoice    = $subscription->get_parent_invoice();
+		$invoice = $subscription->get_parent_invoice();
 		return array(
-			'{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
-			'{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
-			'{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
-			'{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
-			'{subscription_id}'               => absint( $subscription->get_id() ),
-			'{subscription_recurring_amount}' => wpinv_price( wpinv_format_amount( $subscription->get_recurring_amount() ), $invoice->get_currency() ),
-			'{subscription_initial_amount}'   => wpinv_price( wpinv_format_amount( $subscription->get_initial_amount() ), $invoice->get_currency() ),
-			'{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
+			'{subscription_renewal_date}'     => getpaid_format_date_value($subscription->get_next_renewal_date(), __('Never', 'invoicing')),
+			'{subscription_created}'          => getpaid_format_date_value($subscription->get_date_created()),
+			'{subscription_status}'           => sanitize_text_field($subscription->get_status_label()),
+			'{subscription_profile_id}'       => sanitize_text_field($subscription->get_profile_id()),
+			'{subscription_id}'               => absint($subscription->get_id()),
+			'{subscription_recurring_amount}' => wpinv_price(wpinv_format_amount($subscription->get_recurring_amount()), $invoice->get_currency()),
+			'{subscription_initial_amount}'   => wpinv_price(wpinv_format_amount($subscription->get_initial_amount()), $invoice->get_currency()),
+			'{subscription_recurring_period}' => getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), ''),
 			'{subscription_bill_times}'       => $subscription->get_bill_times(),
-			'{subscription_url}'              => esc_url( $subscription->get_view_url() ),
+			'{subscription_url}'              => esc_url($subscription->get_view_url()),
 		);
 
 	}
@@ -119,7 +119,7 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return bool
 	 */
-	public function should_send_notification( $invoice ) {
+	public function should_send_notification($invoice) {
 		return 0 != $invoice->get_id();
 	}
 
@@ -129,14 +129,14 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_recipients( $invoice ) {
-		$recipients = array( $invoice->get_email() );
+	public function get_recipients($invoice) {
+		$recipients = array($invoice->get_email());
 
 		$cc = $invoice->get_email_cc();
 
-		if ( ! empty( $cc ) ) {
-			$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-			$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+		if (!empty($cc)) {
+			$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+			$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 		}
 
 		return $recipients;
@@ -150,45 +150,45 @@ 
 	 * @param string $type
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $subscription, $email, $type, $extra_args = array() ) {
+	public function send_email($subscription, $email, $type, $extra_args = array()) {
 
 		// Abort in case the parent invoice does not exist.
 		$invoice = $subscription->get_parent_invoice();
-		if ( ! $this->should_send_notification( $invoice ) ) {
+		if (!$this->should_send_notification($invoice)) {
 			return;
 		}
 
-		do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_before_send_subscription_notification', $type, $subscription, $email);
 
-		$recipients  = $this->get_recipients( $invoice );
+		$recipients  = $this->get_recipients($invoice);
 		$mailer      = new GetPaid_Notification_Email_Sender();
 		$merge_tags  = $email->get_merge_tags();
-		$content     = $email->get_content( $merge_tags, $extra_args );
-		$subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
+		$content     = $email->get_content($merge_tags, $extra_args);
+		$subject     = $email->add_merge_tags($email->get_subject(), $merge_tags);
 		$attachments = $email->get_attachments();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
+			apply_filters('getpaid_subscription_email_recipients', wpinv_parse_list($recipients), $email),
 			$subject,
 			$content,
 			$attachments
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
+				$subject . __(' - ADMIN BCC COPY', 'invoicing'),
 				$content,
 				$attachments
 			);
 		}
 
-		if ( ! $result ) {
-			$subscription->get_parent_invoice()->add_note( sprintf( __( 'Failed sending %s notification email.', 'invoicing' ), sanitize_key( $type ) ), false, false, true );
+		if (!$result) {
+			$subscription->get_parent_invoice()->add_note(sprintf(__('Failed sending %s notification email.', 'invoicing'), sanitize_key($type)), false, false, true);
 		}
 
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_after_send_subscription_notification', $type, $subscription, $email);
 
 	}
 
@@ -197,10 +197,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_trial( $subscription ) {
+	public function subscription_trial($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -209,10 +209,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_cancelled( $subscription ) {
+	public function subscription_cancelled($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -221,10 +221,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_expired( $subscription ) {
+	public function subscription_expired($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -233,10 +233,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_complete( $subscription ) {
+	public function subscription_complete($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -246,18 +246,18 @@ 
 	 */
 	public function renewal_reminder() {
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__);
 
 		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+		$reminder_days = array_unique(wp_parse_id_list($email->get_option('days')));
 
 		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
+		if (empty($reminder_days)) {
 			return;
 		}
 
 		// Fetch matching subscriptions.
-        $args  = array(
+        $args = array(
             'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active',
@@ -266,8 +266,8 @@ 
             ),
 		);
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "+$days days", current_time( 'timestamp' ) ) ) );
+		foreach ($reminder_days as $days) {
+			$date = date_parse(date('Y-m-d', strtotime("+$days days", current_time('timestamp'))));
 
 			$args['date_expires_query'][] = array(
 				'year'  => $date['year'],
@@ -277,14 +277,14 @@ 
 
 		}
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-        foreach ( $subscriptions as $subscription ) {
+        foreach ($subscriptions as $subscription) {
 
 			// Skip packages.
-			if ( get_post_meta( $subscription->get_product_id(), '_wpinv_type', true ) != 'package' ) {
+			if (get_post_meta($subscription->get_product_id(), '_wpinv_type', true) != 'package') {
 				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
+            	$this->send_email($subscription, $email, __FUNCTION__);
 			}
 
 		}

templates/subscriptions/subscriptions-table-row.php

Spacing +11 added lines, -11 removed lines

@@ -9,21 +9,21 @@ 
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-foreach ( array_keys( $widget->get_subscriptions_table_columns() ) as $column ) :
+foreach (array_keys($widget->get_subscriptions_table_columns()) as $column) :
 
-	$class = sanitize_html_class( $column );
+	$class = sanitize_html_class($column);
 	echo "<td class='getpaid-subscriptions-table-column-$class'>";
 
-		do_action( "getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription );
+		do_action("getpaid_subscriptions_before_frontend_subscription_table_$column", $subscription);
 
-		switch( $column ) :
+		switch ($column) :
 
 			case 'subscription':
 				$subscription_id = (int) $subscription->get_id();
-				$url             = esc_url( $subscription->get_view_url() );
-				echo $widget->add_row_actions( "<a href='$url' class='text-decoration-none'>#$subscription_id</a>", $subscription );
+				$url             = esc_url($subscription->get_view_url());
+				echo $widget->add_row_actions("<a href='$url' class='text-decoration-none'>#$subscription_id</a>", $subscription);
 				break;
 
 			case 'status':
@@ -31,19 +31,19 @@ 
 				break;
 
 			case 'renewal-date':
-				$renewal = getpaid_format_date_value( $subscription->get_next_renewal_date() );
+				$renewal = getpaid_format_date_value($subscription->get_next_renewal_date());
 				echo $subscription->is_active() ? $renewal : "&mdash;";
 				break;
 
 			case 'amount':
-				$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-				$amount    = wpinv_price( wpinv_format_amount( wpinv_sanitize_amount( $subscription->get_recurring_amount() ) ), $subscription->get_parent_payment()->get_currency() );
+				$frequency = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
+				$amount    = wpinv_price(wpinv_format_amount(wpinv_sanitize_amount($subscription->get_recurring_amount())), $subscription->get_parent_payment()->get_currency());
 				echo "<strong style='font-weight: 500;'>$amount</strong> / $frequency";
 				break;
 
 		endswitch;
 
-		do_action( "getpaid_subscriptions_frontend_subscription_table_$column", $subscription );
+		do_action("getpaid_subscriptions_frontend_subscription_table_$column", $subscription);
 
 	echo '</td>';
 

includes/wpinv-address-functions.php

Spacing +128 added lines, -128 removed lines

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