AyeCode / invoicing

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

Spacing +76 added lines, -76 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles subscription notificaiton emails.
@@ -46,21 +46,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_type, $hook );
+			do_action('getpaid_subscription_notification_email_register_hook', $email_type, $hook);
 
 		}
 
@@ -72,12 +72,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)
 			);
 		}
 
@@ -91,25 +91,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}' => sanitize_text_field( wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ) ),
-			'{subscription_initial_amount}'   => sanitize_text_field( wpinv_price( $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}' => sanitize_text_field(wpinv_price($subscription->get_recurring_amount(), $invoice->get_currency())),
+			'{subscription_initial_amount}'   => sanitize_text_field(wpinv_price($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()),
 		);
 
 	}
@@ -120,7 +120,7 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return bool
 	 */
-	public function should_send_notification( $invoice ) {
+	public function should_send_notification($invoice) {
 		return 0 != $invoice->get_id();
 	}
 
@@ -130,14 +130,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;
@@ -151,75 +151,75 @@ 
 	 * @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()) {
 
-		if ( empty( $subscription ) ) {
+		if (empty($subscription)) {
 			return;
 		}
 
-		if ( is_array( $subscription ) ) {
-			$subscription = current( $subscription );
+		if (is_array($subscription)) {
+			$subscription = current($subscription);
 		}
 
-		if ( ! $subscription instanceof WPInv_Subscription ) {
+		if (!$subscription instanceof WPInv_Subscription) {
 			return;
 		}
 
 		// 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;
 		}
 
-		if ( apply_filters( 'getpaid_skip_subscription_email', false, $type, $subscription ) ) {
+		if (apply_filters('getpaid_skip_subscription_email', false, $type, $subscription)) {
 			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 ) {
+		if ($result) {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Successfully sent %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		} else {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Failed sending %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		}
 
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_after_send_subscription_notification', $type, $subscription, $email);
 
 	}
 
@@ -230,10 +230,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_active( $subscription ) {
-		$email = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+	public function subscription_active($subscription) {
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
 
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$this->send_email($subscription, $email, __FUNCTION__);
 	}
 
     /**
@@ -241,10 +241,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__);
 
 	}
 
@@ -253,10 +253,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__);
 
 	}
 
@@ -265,10 +265,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__);
 
 	}
 
@@ -277,10 +277,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__);
 
 	}
 
@@ -290,18 +290,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',
@@ -310,8 +310,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'],
@@ -321,14 +321,14 @@ 
 
 		}
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-        foreach ( $subscriptions->get_results() as $subscription ) {
+        foreach ($subscriptions->get_results() as $subscription) {
 
 			// Skip packages.
-			if ( apply_filters( 'getpaid_send_subscription_renewal_reminder_email', true ) ) {
+			if (apply_filters('getpaid_send_subscription_renewal_reminder_email', true)) {
 				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
+            	$this->send_email($subscription, $email, __FUNCTION__);
 			}
 		}
 

includes/data/email-settings.php

Spacing +243 added lines, -243 removed lines

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

templates/emails/wpinv-email-subscription_active.php

Spacing +4 added lines, -4 removed lines

@@ -8,15 +8,15 @@
  * @var WPInv_Subscription $object
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $invoice = $object->get_parent_payment();
 
 // Print the email header.
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
 // Generate the custom message body.
-echo wp_kses_post( $message_body );
+echo wp_kses_post($message_body);
 
 // Print the email footer.
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);